diff options
Diffstat (limited to 'TAO/tao')
173 files changed, 23052 insertions, 33889 deletions
diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl new file mode 100644 index 00000000000..7c61ef01bef --- /dev/null +++ b/TAO/tao/Bounds.pidl @@ -0,0 +1,48 @@ +/** + * @file Bounds.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the CORBA::Bounds + * exception. + * + * This file is used to generate BoundsC.{h,i,cpp}, using the + * following command: + * + * tao_idl + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * Bounds.pidl + * + * and then: + * + * cp orig/BoundsC.{h,i,cpp} . + * patch < diffs/Bounds.diff + * + * The code left in BoundsC.{h,i,cpp} is ready for use. + * + */ +#ifndef TAO_CORBA_BOUNDS_PIDL +#define TAO_CORBA_BOUNDS_PIDL + +#pragma prefix "omg.org" + +module CORBA +{ + /** + * @exception Bounds + * + * @brief UserException for NVList::item() + * + * This exception is thrown on attempts to access 'out of bounds' + * items in an NVList. + */ + exception Bounds {}; +}; + +#pragma prefix "" + +#endif /* TAO_CORBA_BOUNDS_PIDL */ diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index 2867ef3270d..0b6eef1cf32 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -1,130 +1,222 @@ -/* -*- 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 -// Distributed Object Computing at Washington University, St. Louis. +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "BoundsC.h" + +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" -#include "tao/BoundsC.h" -#include "tao/Typecode.h" +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/BoundsC.i" +#include "BoundsC.i" #endif /* !defined INLINE */ -// default constructor -CORBA_Bounds::CORBA_Bounds (void) +// Default constructor. +CORBA::Bounds::Bounds (void) : CORBA_UserException ("IDL:omg.org/CORBA/Bounds:1.0") { } -// destructor - all members are of self managing types -CORBA_Bounds::~CORBA_Bounds (void) +// Destructor - all members are of self managing types. +CORBA::Bounds::~Bounds (void) { } -void CORBA_Bounds::_tao_any_destructor (void *x) -{ - CORBA_Bounds *tmp = ACE_static_cast (CORBA_Bounds*,x); - delete tmp; -} - -// copy constructor -CORBA_Bounds::CORBA_Bounds (const CORBA::Bounds &_tao_excp) +// Copy constructor. +CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp) : CORBA_UserException (_tao_excp._id ()) { } -// assignment operator -CORBA_Bounds& -CORBA_Bounds::operator= (const CORBA_Bounds &_tao_excp) +// Assignment operator. +CORBA::Bounds& +CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp) { - this->CORBA_UserException::operator= (_tao_excp); return *this; } -// narrow -CORBA_Bounds_ptr -CORBA_Bounds::_downcast (CORBA_Exception *exc) +void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CORBA_Bounds_ptr, exc); + Bounds *tmp = ACE_static_cast (Bounds*, _tao_void_pointer); + delete tmp; +} + +CORBA::Bounds * +CORBA::Bounds::_downcast (CORBA::Exception *exc) +{ + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", exc->_id ())) + { + return ACE_dynamic_cast (Bounds *, exc); + } else - return 0; + { + return 0; + } +} + +CORBA::Exception *CORBA::Bounds::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::CORBA::Bounds, 0); + return retval; } +CORBA::Exception * +CORBA::Bounds::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA::Bounds (*this), + 0 + ); + return result; +} -void CORBA_Bounds::_raise () +void CORBA::Bounds::_raise () { - TAO_RAISE(*this); + TAO_RAISE (*this); } -void CORBA_Bounds::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const +void CORBA::Bounds::_tao_encode ( + TAO_OutputCDR &cdr + ACE_ENV_ARG_DECL + ) const { if (cdr << *this) - return; + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } -void CORBA_Bounds::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) +void CORBA::Bounds::_tao_decode ( + TAO_InputCDR &cdr + ACE_ENV_ARG_DECL + ) { if (cdr >> *this) - return; + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method -CORBA::Exception *CORBA_Bounds::_alloc (void) +static const CORBA::Long _oc_CORBA_Bounds[] = { - CORBA::Exception *retval = 0; + TAO_ENCAP_BYTE_ORDER, // byte order + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f426f), + ACE_NTOHL (0x756e6473), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Bounds:1.0 + 7, + ACE_NTOHL (0x426f756e), + ACE_NTOHL (0x64730000), // name = Bounds + 0, // member count +}; - ACE_NEW_RETURN (retval, - CORBA_Bounds, - 0); +static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds ( + CORBA::tk_except, + sizeof (_oc_CORBA_Bounds), + (char *) &_oc_CORBA_Bounds, + 0, + sizeof (CORBA::Bounds) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (CORBA) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Bounds, &_tc_TAO_tc_CORBA_Bounds) +TAO_NAMESPACE_END - return retval; -} -CORBA::TypeCode_ptr -CORBA_Bounds::_type (void) const +// TAO extension - the virtual _type method. +CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const { - return CORBA::TypeCode::_tc_Bounds; + return ::CORBA::_tc_Bounds; } -void operator<<= (CORBA::Any &_tao_any, const CORBA::Bounds &_tao_elem) +void operator<<= (CORBA::Any &_tao_any, const CORBA::Bounds &_tao_elem) // copying { TAO_OutputCDR stream; stream << _tao_elem; - _tao_any._tao_replace (CORBA::_tc_Bounds, - TAO_ENCAP_BYTE_ORDER, - stream.begin ()); + _tao_any._tao_replace ( + CORBA::_tc_Bounds, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } void operator<<= (CORBA::Any &_tao_any, CORBA::Bounds *_tao_elem) // non copying { TAO_OutputCDR stream; stream << *_tao_elem; - _tao_any._tao_replace (CORBA::_tc_Bounds, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - CORBA::Bounds::_tao_any_destructor); + _tao_any._tao_replace ( + CORBA::_tc_Bounds, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + CORBA::Bounds::_tao_any_destructor + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Bounds *&_tao_elem) { + return _tao_any >>= ACE_const_cast( + const CORBA::Bounds*&, + _tao_elem + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Bounds *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equal (CORBA::_tc_Bounds ACE_ENV_ARG_PARAMETER)) return 0; // not equal + + CORBA::Boolean result = type->equivalent (CORBA::_tc_Bounds ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = (CORBA::Bounds *)_tao_any.value (); @@ -132,32 +224,40 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Bounds *&_tao_ele } else { - ACE_NEW_RETURN (_tao_elem, CORBA::Bounds, 0); + CORBA::Bounds *tmp; + ACE_NEW_RETURN (tmp, CORBA::Bounds, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order ()); - if (stream >> *_tao_elem) + _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/Bounds:1.0")) + return 0; + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( CORBA::_tc_Bounds, 1, - ACE_reinterpret_cast (void*, _tao_elem), - CORBA::Bounds::_tao_any_destructor); + tmp, + CORBA::Bounds::_tao_any_destructor + ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } + diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h index a0d1db7bd70..db2b97ea744 100644 --- a/TAO/tao/BoundsC.h +++ b/TAO/tao/BoundsC.h @@ -1,36 +1,50 @@ -/* -*- C++ -*- */ -//$Id$ -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_BOUNDSC_H_ -#define _TAO_IDL_BOUNDSC_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_ORIG_BOUNDSC_H_ +#define _TAO_IDL_ORIG_BOUNDSC_H_ +#include "ace/pre.h" #include "tao/corbafwd.h" -#include "tao/Exception.h" -#include "tao/CDR.h" -#include "tao/Any.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "TAO_Export.h" +#include "Exception.h" +#include "CDR.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO +#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 +# define TAO_EXPORT_NESTED_MACRO TAO_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -38,55 +52,83 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +TAO_NAMESPACE CORBA +{ + #if !defined (_CORBA_BOUNDS_CH_) #define _CORBA_BOUNDS_CH_ - - class TAO_Export CORBA_Bounds : public CORBA::UserException + + class TAO_Export Bounds : public CORBA::UserException { public: + + Bounds (void); + Bounds (const Bounds &); + ~Bounds (void); - CORBA_Bounds (void); // default ctor - CORBA_Bounds (const CORBA_Bounds &); // copy ctor - ~CORBA_Bounds (void); // dtor - CORBA_Bounds &operator= (const CORBA_Bounds &); + Bounds &operator= (const Bounds &); + static void _tao_any_destructor (void*); - virtual void _raise (void); + static Bounds *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); - virtual void _tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL_NOT_USED) const; - virtual void _tao_decode (TAO_InputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED); + virtual CORBA::Exception *_tao_duplicate (void) const; - static CORBA_Bounds *_downcast (CORBA::Exception *); - static void _tao_any_destructor (void*); + virtual void _raise (void); - // = TAO extension - static CORBA::Exception *_alloc (void); + virtual void _tao_encode ( + TAO_OutputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ) const; + + virtual void _tao_decode ( + TAO_InputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ); + + virtual CORBA::TypeCode_ptr _type (void) const; - }; // exception CORBA::Bounds + }; +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Bounds; + + #endif /* end #if !defined */ + + +} +TAO_NAMESPACE_CLOSE // module CORBA - -void operator<<= (CORBA::Any &, const CORBA::Bounds &); // copying version -void operator<<= (CORBA::Any &, CORBA::Bounds*); // noncopying version -CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Bounds *&); +TAO_Export void operator<<= (CORBA::Any &, const CORBA::Bounds &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::Bounds*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Bounds *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Bounds *&); #ifndef __ACE_INLINE__ -CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &); // -CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &); + #endif /* __ACE_INLINE__ */ #if defined (__ACE_INLINE__) -#include "tao/BoundsC.i" +#include "BoundsC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + #include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/BoundsC.i b/TAO/tao/BoundsC.i index 2635b0c4b7f..85b84da1e7b 100644 --- a/TAO/tao/BoundsC.i +++ b/TAO/tao/BoundsC.i @@ -1,11 +1,23 @@ -/* -*- C++ -*- */ -//$Id$ -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html // ************************************************************* // Inline operations for exception CORBA::Bounds @@ -20,7 +32,8 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Bounds & return 0; } -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &) +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,CORBA::Bounds&) { return 1; } + diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl index e05be5ff6c7..ff7c6807510 100644 --- a/TAO/tao/Current.pidl +++ b/TAO/tao/Current.pidl @@ -27,7 +27,7 @@ // command used for this is: // // tao_idl.exe -// -Ge 1 +// -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 // -Wb,export_macro=TAO_Export // -Wb,export_include="tao/corbafwd.h" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl index 75ee4222449..ea5489673c1 100644 --- a/TAO/tao/Domain.pidl +++ b/TAO/tao/Domain.pidl @@ -1,82 +1,58 @@ -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// Domain.pidl -// -// = DESCRIPTION -// -// This file was used to generate the code in DomainC.{h,i,cpp}. -// -// The steps to regenerate the code are as follows: -// -// 1. Patch this pidl file to (a) remove the CORBA module bringing -// the Domain interfaces to the global scope; and (b) rename the -// Domain interfaces to CORBA_xxxx. -// -// Apply patches using the following commands: -// -// patch < diffs/Domain.pidl.diff -// patch < diffs/Policy.pidl.diff -// -// The second patch is because Policy.pidl is included in -// Domain.pidl. -// -// 2. Run the tao_idl compiler on the patched pidl file. The -// command used for this is: -// -// tao_idl.exe -// -Ge 1 -// -Wb,export_macro=TAO_Export -// -Wb,export_include="tao/corbafwd.h" -// -Wb,pre_include="ace/pre.h" -// -Wb,post_include="ace/post.h" -// Domain.pidl -// -// 3. Then patch the generated code. This patch (a) fixes the -// interface repository IDs; (b) eliminates cycles in the include -// dependencies; (c) removes the extra CORBA module. -// -// Apply patches using the following commands: -// -// patch < diffs/DomainC.h.diff -// patch < diffs/DomainC.i.diff -// patch < diffs/DomainC.cpp.diff -// -// patch < diffs/DomainS.cpp.diff -// -// 4. You'll have to move the Domain skeleton files from TAO/tao -// to the TAO_Domain library by hand. -// -// 5. Undo the patches to the pidl files. -// -// Note: The diffs were generated with these commands: -// -// diff -wbu Domain.pidl Domain.pidl.mod > diffs/Domain.pidl.diff -// -// diff -wbu DomainC.h DomainC.h.mod > diffs/DomainC.h.diff -// diff -wbu DomainC.i DomainC.i.mod > diffs/DomainC.i.diff -// diff -wbu DomainC.cpp DomainC.cpp.mod > diffs/DomainC.cpp.diff -// -// diff -wbu DomainS.cpp DomainS.cpp.mod > diffs/DomainS.cpp.diff -// -// ================================================================ +/** + * @file Domain.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the CORBA::Domain related + * classes. + * + * This file was used to generate the code in DomainC.{h,i,cpp}. + * + * The steps to regenerate the code are as follows: + * + * 1. Run the tao_idl compiler on the patched pidl file. The + * command used for this is: + * + * tao_idl + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_Export + * -Wb,export_include="tao/corbafwd.h" + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * Domain.pidl + * + * 2. Then patch the generated code. This patch (a) eliminates + * cycles in the include dependencies. + * + * Apply patches using the following commands: + * + * cp orig/DomainC.{h,i,cpp} . + * cp orig/Domain{S,S_T}.{h,i,cpp} Domain + * patch < diffs/Domain.diff + * + * 3. You'll have to move the Domain skeleton files from TAO/tao + * to the TAO_Domain library by hand. + * + * Note: The diffs were generated with these commands: + * + * for i in DomainC.{h,i,cpp}; do + * diff -wBbu orig/$i $i; + * done > diffs/Domain.diff + * for i in Domain{S,S_T}.{h,i,cpp}; do + * diff -wBbu orig/$i Domain/$i; + * done >> diffs/Domain.diff + */ -#ifndef POLICY_DOMAIN_IDL -#define POLICY_DOMAIN_IDL +#ifndef TAO_CORBA_DOMAIN_PIDL +#define TAO_CORBA_DOMAIN_PIDL -#pragma prefix "omg.org" +#include <Policy.pidl> +#include <InterfaceDef.pidl> -#include "Policy.pidl" +#pragma prefix "omg.org" module CORBA { - interface InterfaceDef; - interface DomainManager { Policy get_domain_policy ( @@ -99,4 +75,4 @@ module CORBA #pragma prefix "" -#endif /* !defined POLICY_DOMAIN_IDL */ +#endif /* TAO_CORBA_DOMAIN_IDL */ diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index 9e1d83e7576..8db62052e7f 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_DOMAINS_CPP_ -#define _TAO_IDL_DOMAINS_CPP_ +#ifndef _TAO_IDL_ORIG_DOMAINS_CPP_ +#define _TAO_IDL_ORIG_DOMAINS_CPP_ #include "DomainS.h" @@ -34,13 +34,14 @@ #if TAO_HAS_INTERCEPTORS == 1 #include "tao/RequestInfo_Util.h" +#include "tao/PICurrent.h" #include "tao/PortableServer/ServerRequestInfo.h" #include "tao/PortableServer/ServerInterceptorAdapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ +#include "ace/Dynamic_Service.h" #include "tao/IFR_Client/IFR_ExtendedC.h" -#include "ace/Dynamic_Service.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus #endif /* __BORLANDC__ */ @@ -56,9 +57,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 18:44:56 */ +/* starting time is 17:27:57 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/amh/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -121,19 +122,20 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned MIN_HASH_VALUE = 5, MAX_HASH_VALUE = 17, HASH_VALUE_RANGE = 13, - DUPLICATES = 0 + DUPLICATES = 0, + WORDLIST_SIZE = 9 }; static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0},{"",0}, - {"_is_a", &POA_CORBA_DomainManager::_is_a_skel}, + {"_is_a", &POA_CORBA::DomainManager::_is_a_skel}, {"",0},{"",0},{"",0},{"",0}, - {"_interface", &POA_CORBA_DomainManager::_interface_skel}, + {"_interface", &POA_CORBA::DomainManager::_interface_skel}, {"",0},{"",0}, - {"_non_existent", &POA_CORBA_DomainManager::_non_existent_skel}, + {"_non_existent", &POA_CORBA::DomainManager::_non_existent_skel}, {"",0},{"",0},{"",0}, - {"get_domain_policy", &POA_CORBA_DomainManager::get_domain_policy_skel}, + {"get_domain_policy", &POA_CORBA::DomainManager::get_domain_policy_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -150,7 +152,7 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned } return 0; } -/* ending time is 18:44:56 */ +/* ending time is 17:27:57 */ static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -159,25 +161,24 @@ class TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy : public TAO_S public: TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_DomainManager *tao_impl + TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::DomainManager *tao_impl , - const CORBA::PolicyType & policy_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( @@ -189,24 +190,23 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void result (CORBA::Policy_ptr result); + void result (::CORBA::Policy_ptr result); private: TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy &); void operator= (const TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy &); private: - POA_CORBA_DomainManager *_tao_impl; + POA_CORBA::DomainManager *_tao_impl; const CORBA::PolicyType & policy_type_; - CORBA::Policy_ptr _result; + ::CORBA::Policy_ptr _result; }; TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_DomainManager *tao_impl, - const CORBA::PolicyType & policy_type - ACE_ENV_ARG_DECL_NOT_USED + POA_CORBA::DomainManager *tao_impl, + const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -227,7 +227,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_ parameter_list->length (1); CORBA::ULong len = 0; - (*parameter_list)[len].argument <<= policy_type_; + (*parameter_list)[len].argument <<= policy_type_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -246,6 +246,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV return exception_list; } + CORBA::Any * TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -282,7 +283,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_is_a ( } void -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Policy_ptr result) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result) { // Update the result. this->_result = result; @@ -295,35 +296,35 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Poli // // Factory function Implementation. -_TAO_DomainManager_Strategized_Proxy_Broker *_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker *POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker (void) { - static _TAO_DomainManager_Strategized_Proxy_Broker strategized_proxy_broker; + static POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker strategized_proxy_broker; return &strategized_proxy_broker; } -_TAO_DomainManager_Strategized_Proxy_Broker::_TAO_DomainManager_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::_TAO_DomainManager_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; } -_TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; } -_TAO_CORBA_DomainManager_Proxy_Impl& -_TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( +CORBA::_TAO_DomainManager_Proxy_Impl& +POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( ::CORBA::DomainManager *object ACE_ENV_ARG_DECL ) { int strategy = TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; @@ -336,7 +337,7 @@ _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( } void -_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy ( +POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy ( int strategy ACE_ENV_ARG_DECL ) @@ -350,7 +351,16 @@ _TAO_DomainManager_Strategized_Proxy_Broker::create_proxy ( case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], - _TAO_DomainManager_ThruPOA_Proxy_Impl, + POA_CORBA::_TAO_DomainManager_ThruPOA_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl, CORBA::NO_MEMORY () ); ACE_CHECK; @@ -360,7 +370,7 @@ _TAO_DomainManager_Strategized_Proxy_Broker::create_proxy ( default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], - ::_TAO_CORBA_DomainManager_Remote_Proxy_Impl, + ::CORBA::_TAO_DomainManager_Remote_Proxy_Impl, CORBA::NO_MEMORY () ); ACE_CHECK; @@ -377,17 +387,17 @@ _TAO_DomainManager_Strategized_Proxy_Broker::create_proxy ( /////////////////////////////////////////////////////////////////////// -_TAO_CORBA_DomainManager_Proxy_Broker * +CORBA::_TAO_DomainManager_Proxy_Broker * CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) { ACE_UNUSED_ARG (obj); - return ::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker(); + return ::POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker(); } int CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (long) { - CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer = + CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer = CORBA__TAO_DomainManager_Proxy_Broker_Factory_function; return 0; @@ -401,13 +411,13 @@ static int CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarec // ThruPOA Proxy Implementation // -_TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Proxy_Impl (void) +POA_CORBA::_TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Proxy_Impl (void) {} // ThruPOA Implementation of the IDL interface methods -CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( - CORBA::Object_ptr _collocated_tao_target_, +::CORBA::Policy_ptr POA_CORBA::_TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( + CORBA_Object *_collocated_tao_target_, CORBA::PolicyType policy_type ACE_ENV_ARG_DECL ) @@ -415,7 +425,7 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( CORBA::SystemException )) { - CORBA::Policy_var _tao_retval; + ::CORBA::Policy_var _tao_retval; ACE_UNUSED_ARG (_tao_retval); TAO_Object_Adapter::Servant_Upcall servant_upcall ( _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () @@ -427,15 +437,14 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( forward_to.out () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_CORBA_DomainManager_ptr, + ACE_CHECK_RETURN (_tao_retval._retn ()); + return ACE_reinterpret_cast ( + POA_CORBA::DomainManager_ptr, servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA/DomainManager:1.0" ) )->get_domain_policy ( - policy_type - ACE_ENV_ARG_PARAMETER + policy_type ACE_ENV_ARG_PARAMETER ); } @@ -443,23 +452,52 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( // End ThruPOA Proxy Implementation /////////////////////////////////////////////////////////////////////// -// skeleton constructor -POA_CORBA_DomainManager::POA_CORBA_DomainManager (void) + +/////////////////////////////////////////////////////////////////////// +// Direct Proxy Implementation +// + +POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::_TAO_DomainManager_Direct_Proxy_Impl (void) +{} + +::CORBA::Policy_ptr POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy ( + CORBA_Object *_collocated_tao_target_, + CORBA::PolicyType policy_type + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + return ACE_reinterpret_cast ( + POA_CORBA::DomainManager_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/DomainManager:1.0") + )->get_domain_policy ( + policy_type ACE_ENV_ARG_PARAMETER + ); + +} + + +// +// End Direct Proxy Implementation +/////////////////////////////////////////////////////////////////////// +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_ss.cpp:100 +POA_CORBA::DomainManager::DomainManager (void) { this->optable_ = &tao_CORBA_DomainManager_optable; } -// copy ctor -POA_CORBA_DomainManager::POA_CORBA_DomainManager (const POA_CORBA_DomainManager& rhs) - : TAO_ServantBase (rhs) +POA_CORBA::DomainManager::DomainManager (const DomainManager& rhs) + : TAO_ServantBase (rhs) {} -// skeleton destructor -POA_CORBA_DomainManager::~POA_CORBA_DomainManager (void) +POA_CORBA::DomainManager::~DomainManager (void) { } -void POA_CORBA_DomainManager::get_domain_policy_skel ( +void POA_CORBA::DomainManager::get_domain_policy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall @@ -467,19 +505,20 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA_DomainManager *_tao_impl = - ACE_static_cast (POA_CORBA_DomainManager *, _tao_object_reference); - - CORBA::Policy_var _tao_retval; + POA_CORBA::DomainManager *_tao_impl = + ACE_static_cast ( + POA_CORBA::DomainManager *, + _tao_object_reference + ); + ::CORBA::Policy_var _tao_retval; CORBA::PolicyType policy_type; if (!( (_tao_in >> policy_type) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); @@ -488,46 +527,50 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( _tao_server_request.interceptor_count () ); - TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy ri ( + TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, - policy_type - ACE_ENV_ARG_PARAMETER + policy_type ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = - _tao_impl->get_domain_policy ( - policy_type - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; + _tao_retval = + _tao_impl->get_domain_policy ( + policy_type ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) - CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn (); - ri.result (_tao_retval_info); + } + + ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn (); + _tao_ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -545,12 +588,14 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} -void POA_CORBA_DomainManager::_is_a_skel ( + } + +void POA_CORBA::DomainManager::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ @@ -558,7 +603,7 @@ void POA_CORBA_DomainManager::_is_a_skel ( ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference; + POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference; CORBA::Boolean _tao_retval = 0; CORBA::String_var value; if (!(_tao_in >> value.out ())) @@ -573,15 +618,16 @@ void POA_CORBA_DomainManager::_is_a_skel ( ACE_THROW (CORBA::MARSHAL ()); } -void POA_CORBA_DomainManager::_non_existent_skel ( +void POA_CORBA::DomainManager::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { - POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference; + CORBA::Boolean _tao_retval = + _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -590,14 +636,14 @@ void POA_CORBA_DomainManager::_non_existent_skel ( ACE_THROW (CORBA::MARSHAL ()); } -void POA_CORBA_DomainManager::_interface_skel ( +void POA_CORBA::DomainManager::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { - POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference; + POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; @@ -613,7 +659,8 @@ void POA_CORBA_DomainManager::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = + _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -638,14 +685,12 @@ void POA_CORBA_DomainManager::_interface_skel ( } } -CORBA::Boolean POA_CORBA_DomainManager::_is_a ( +CORBA::Boolean POA_CORBA::DomainManager::_is_a ( const char* value - ACE_ENV_ARG_DECL + ACE_ENV_ARG_DECL_NOT_USED ) { - const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - + const char *base_id = "IDL:org.omg/CORBA/Object:1.0"; if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) @@ -654,18 +699,27 @@ CORBA::Boolean POA_CORBA_DomainManager::_is_a ( return 0; } -void* POA_CORBA_DomainManager::_downcast ( +void* POA_CORBA::DomainManager::_downcast ( const char* logical_type_id ) { if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DomainManager:1.0") == 0) - return ACE_static_cast (POA_CORBA_DomainManager_ptr, this); + return ACE_static_cast (POA_CORBA::DomainManager_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); return 0; } -void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) +const char* POA_CORBA::DomainManager::_interface_repository_id (void) const +{ + return "IDL:omg.org/CORBA/DomainManager:1.0"; +} + +void POA_CORBA::DomainManager::_dispatch ( + TAO_ServerRequest &req, + void *servant_upcall + ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, @@ -673,13 +727,9 @@ void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_u ACE_ENV_ARG_PARAMETER); } -const char* POA_CORBA_DomainManager::_interface_repository_id (void) const -{ - return "IDL:omg.org/CORBA/DomainManager:1.0"; -} CORBA::DomainManager* -POA_CORBA_DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL) { TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -708,9 +758,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 18:44:57 */ +/* starting time is 17:27:57 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/amh/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -773,24 +823,25 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi MIN_HASH_VALUE = 4, MAX_HASH_VALUE = 19, HASH_VALUE_RANGE = 16, - DUPLICATES = 0 + DUPLICATES = 0, + WORDLIST_SIZE = 11 }; static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"copy", &POA_CORBA_ConstructionPolicy::copy_skel}, - {"_is_a", &POA_CORBA_ConstructionPolicy::_is_a_skel}, + {"copy", &POA_CORBA::ConstructionPolicy::copy_skel}, + {"_is_a", &POA_CORBA::ConstructionPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_CORBA_ConstructionPolicy::destroy_skel}, + {"destroy", &POA_CORBA::ConstructionPolicy::destroy_skel}, {"",0},{"",0}, - {"_interface", &POA_CORBA_ConstructionPolicy::_interface_skel}, + {"_interface", &POA_CORBA::ConstructionPolicy::_interface_skel}, {"",0},{"",0}, - {"_non_existent", &POA_CORBA_ConstructionPolicy::_non_existent_skel}, + {"_non_existent", &POA_CORBA::ConstructionPolicy::_non_existent_skel}, {"",0},{"",0}, - {"_get_policy_type", &POA_CORBA_ConstructionPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_CORBA::ConstructionPolicy::_get_policy_type_skel}, {"",0},{"",0}, - {"make_domain_manager", &POA_CORBA_ConstructionPolicy::make_domain_manager_skel}, + {"make_domain_manager", &POA_CORBA::ConstructionPolicy::make_domain_manager_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -807,7 +858,7 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi } return 0; } -/* ending time is 18:44:57 */ +/* ending time is 17:27:57 */ static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -816,26 +867,25 @@ class TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager : publi public: TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstructionPolicy *tao_impl + TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::ConstructionPolicy *tao_impl , CORBA::InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( @@ -853,7 +903,7 @@ private: void operator= (const TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &); private: - POA_CORBA_ConstructionPolicy *_tao_impl; + POA_CORBA::ConstructionPolicy *_tao_impl; CORBA::InterfaceDef_ptr object_type_; const CORBA::Boolean & constr_policy_; @@ -862,10 +912,9 @@ private: TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_ConstructionPolicy *tao_impl, + POA_CORBA::ConstructionPolicy *tao_impl, CORBA::InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy - ACE_ENV_ARG_DECL_NOT_USED + const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -884,13 +933,21 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A Dynamic::ParameterList_var safe_parameter_list = parameter_list; + TAO_IFR_Client_Adapter *adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); + parameter_list->length (2); CORBA::ULong len = 0; - (*parameter_list)[len].argument <<= this->object_type_; + adapter->interfacedef_any_insert ( + (*parameter_list)[len].argument, + this->object_type_ + ); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_); + (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -909,6 +966,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions ( return exception_list; } + CORBA::Any * TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -947,35 +1005,35 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_is_a // // Factory function Implementation. -_TAO_ConstructionPolicy_Strategized_Proxy_Broker *_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker *POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void) { - static _TAO_ConstructionPolicy_Strategized_Proxy_Broker strategized_proxy_broker; + static POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker strategized_proxy_broker; return &strategized_proxy_broker; } -_TAO_ConstructionPolicy_Strategized_Proxy_Broker::_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; } -_TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; } -_TAO_CORBA_ConstructionPolicy_Proxy_Impl& -_TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( - ::CORBA_ConstructionPolicy *object +CORBA::_TAO_ConstructionPolicy_Proxy_Impl& +POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( + ::CORBA::ConstructionPolicy *object ACE_ENV_ARG_DECL ) { int strategy = TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; @@ -988,7 +1046,7 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( } void -_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy ( +POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy ( int strategy ACE_ENV_ARG_DECL ) @@ -1002,7 +1060,16 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy ( case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], - _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl, + POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl, CORBA::NO_MEMORY () ); ACE_CHECK; @@ -1012,7 +1079,7 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy ( default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], - ::_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl, + ::CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl, CORBA::NO_MEMORY () ); ACE_CHECK; @@ -1029,17 +1096,17 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy ( /////////////////////////////////////////////////////////////////////// -_TAO_CORBA_ConstructionPolicy_Proxy_Broker * +CORBA::_TAO_ConstructionPolicy_Proxy_Broker * CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) { ACE_UNUSED_ARG (obj); - return ::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker(); + return ::POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker(); } int CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (long) { - CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer = + CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer = CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function; return 0; @@ -1053,13 +1120,13 @@ static int CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_S // ThruPOA Proxy Implementation // -_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void) +POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void) {} // ThruPOA Implementation of the IDL interface methods -void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( - CORBA::Object_ptr _collocated_tao_target_, +void POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( + CORBA_Object *_collocated_tao_target_, CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy ACE_ENV_ARG_DECL @@ -1079,15 +1146,14 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( - POA_CORBA_ConstructionPolicy_ptr, + ACE_reinterpret_cast ( + POA_CORBA::ConstructionPolicy_ptr, servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA/ConstructionPolicy:1.0" ) )->make_domain_manager ( object_type, - constr_policy - ACE_ENV_ARG_PARAMETER + constr_policy ACE_ENV_ARG_PARAMETER ); return; } @@ -1096,24 +1162,55 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( // End ThruPOA Proxy Implementation /////////////////////////////////////////////////////////////////////// -// skeleton constructor -POA_CORBA_ConstructionPolicy::POA_CORBA_ConstructionPolicy (void) + +/////////////////////////////////////////////////////////////////////// +// Direct Proxy Implementation +// + +POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) +{} + +void POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager ( + CORBA_Object *_collocated_tao_target_, + CORBA::InterfaceDef_ptr object_type, + CORBA::Boolean constr_policy + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_reinterpret_cast ( + POA_CORBA::ConstructionPolicy_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/ConstructionPolicy:1.0") + )->make_domain_manager ( + object_type, + constr_policy ACE_ENV_ARG_PARAMETER + ); + +} + + +// +// End Direct Proxy Implementation +/////////////////////////////////////////////////////////////////////// +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_ss.cpp:100 +POA_CORBA::ConstructionPolicy::ConstructionPolicy (void) { this->optable_ = &tao_CORBA_ConstructionPolicy_optable; } -// copy ctor -POA_CORBA_ConstructionPolicy::POA_CORBA_ConstructionPolicy (const POA_CORBA_ConstructionPolicy& rhs) - : POA_CORBA_Policy (rhs), +POA_CORBA::ConstructionPolicy::ConstructionPolicy (const ConstructionPolicy& rhs) + : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), TAO_ServantBase (rhs) {} -// skeleton destructor -POA_CORBA_ConstructionPolicy::~POA_CORBA_ConstructionPolicy (void) +POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void) { } -void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( +void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall @@ -1121,9 +1218,11 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA_ConstructionPolicy *_tao_impl = - ACE_static_cast (POA_CORBA_ConstructionPolicy *, _tao_object_reference); - + POA_CORBA::ConstructionPolicy *_tao_impl = + ACE_static_cast ( + POA_CORBA::ConstructionPolicy *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); CORBA::InterfaceDef_var object_type; CORBA::Boolean constr_policy; @@ -1131,11 +1230,10 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( (_tao_in >> object_type.out ()) && (_tao_in >> CORBA::Any::to_boolean (constr_policy)) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); @@ -1144,45 +1242,49 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( _tao_server_request.interceptor_count () ); - TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ri ( + TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, object_type.in (), - constr_policy - ACE_ENV_ARG_PARAMETER + constr_policy ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - _tao_impl->make_domain_manager ( - object_type.in (), - constr_policy - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; + _tao_impl->make_domain_manager ( + object_type.in (), + constr_policy ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1195,10 +1297,12 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( _tao_server_request.init_reply (); + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} -void POA_CORBA_ConstructionPolicy::_is_a_skel ( + } + +void POA_CORBA::ConstructionPolicy::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ @@ -1206,7 +1310,7 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel ( ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference; + POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference; CORBA::Boolean _tao_retval = 0; CORBA::String_var value; if (!(_tao_in >> value.out ())) @@ -1221,15 +1325,16 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel ( ACE_THROW (CORBA::MARSHAL ()); } -void POA_CORBA_ConstructionPolicy::_non_existent_skel ( +void POA_CORBA::ConstructionPolicy::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { - POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference; + CORBA::Boolean _tao_retval = + _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1238,14 +1343,14 @@ void POA_CORBA_ConstructionPolicy::_non_existent_skel ( ACE_THROW (CORBA::MARSHAL ()); } -void POA_CORBA_ConstructionPolicy::_interface_skel ( +void POA_CORBA::ConstructionPolicy::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { - POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference; + POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; @@ -1261,7 +1366,8 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = + _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1286,14 +1392,12 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( } } -CORBA::Boolean POA_CORBA_ConstructionPolicy::_is_a ( +CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a ( const char* value - ACE_ENV_ARG_DECL + ACE_ENV_ARG_DECL_NOT_USED ) { - const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - + const char *base_id = "IDL:org.omg/CORBA/Object:1.0"; if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || @@ -1303,20 +1407,29 @@ CORBA::Boolean POA_CORBA_ConstructionPolicy::_is_a ( return 0; } -void* POA_CORBA_ConstructionPolicy::_downcast ( +void* POA_CORBA::ConstructionPolicy::_downcast ( const char* logical_type_id ) { if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstructionPolicy:1.0") == 0) - return ACE_static_cast (POA_CORBA_ConstructionPolicy_ptr, this); + return ACE_static_cast (POA_CORBA::ConstructionPolicy_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA_Policy_ptr, this); + return ACE_static_cast (POA_CORBA::Policy_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); return 0; } -void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) +const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const +{ + return "IDL:omg.org/CORBA/ConstructionPolicy:1.0"; +} + +void POA_CORBA::ConstructionPolicy::_dispatch ( + TAO_ServerRequest &req, + void *servant_upcall + ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, @@ -1324,13 +1437,9 @@ void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *serv ACE_ENV_ARG_PARAMETER); } -const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const -{ - return "IDL:omg.org/CORBA/ConstructionPolicy:1.0"; -} -CORBA_ConstructionPolicy* -POA_CORBA_ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ConstructionPolicy* +POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL) { TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -1348,7 +1457,7 @@ POA_CORBA_ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL) (void) safe_stub.release (); - return CORBA_ConstructionPolicy::_unchecked_narrow (obj.in ()); + return ::CORBA::ConstructionPolicy::_unchecked_narrow (obj.in ()); } diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h index 5c039d1da46..8d84903e56b 100644 --- a/TAO/tao/Domain/DomainS.h +++ b/TAO/tao/Domain/DomainS.h @@ -19,25 +19,24 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_DOMAINS_H_ -#define _TAO_IDL_DOMAINS_H_ +#ifndef _TAO_IDL_ORIG_DOMAINS_H_ +#define _TAO_IDL_ORIG_DOMAINS_H_ #include "ace/pre.h" +#include "tao/PortableServer/PolicyS.h" +#include "tao/DomainC.h" -#include "domain_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DomainC.h" -#include "tao/PortableServer/PolicyS.h" - #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Base.h" #include "tao/PortableServer/Collocated_Object.h" #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h" #include "tao/PortableServer/Direct_Object_Proxy_Impl.h" + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -49,26 +48,30 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ - class POA_CORBA_DomainManager; - typedef POA_CORBA_DomainManager *POA_CORBA_DomainManager_ptr; +TAO_NAMESPACE POA_CORBA +{ + class DomainManager; + typedef DomainManager *DomainManager_ptr; // Forward Classes Declaration class _TAO_DomainManager_ThruPOA_Proxy_Impl; + class _TAO_DomainManager_Direct_Proxy_Impl; class _TAO_DomainManager_Strategized_Proxy_Broker; - class TAO_Domain_Export POA_CORBA_DomainManager : public virtual PortableServer::ServantBase + class TAO_Export DomainManager + : public virtual PortableServer::ServantBase { protected: - POA_CORBA_DomainManager (void); + DomainManager (void); public: - POA_CORBA_DomainManager (const POA_CORBA_DomainManager& rhs); - virtual ~POA_CORBA_DomainManager (void); + DomainManager (const DomainManager& rhs); + virtual ~DomainManager (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual void* _downcast ( const char* logical_type_id @@ -102,20 +105,20 @@ ); ::CORBA::DomainManager *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; - virtual CORBA::Policy_ptr get_domain_policy ( + virtual ::CORBA::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - static void get_domain_policy_skel ( + static void get_domain_policy_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall @@ -130,14 +133,14 @@ // Strategized Proxy Broker Declaration // - class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual _TAO_CORBA_DomainManager_Proxy_Broker + class TAO_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_DomainManager_Proxy_Broker { public: _TAO_DomainManager_Strategized_Proxy_Broker (void); virtual ~_TAO_DomainManager_Strategized_Proxy_Broker (void); - virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy ( + virtual ::CORBA::_TAO_DomainManager_Proxy_Impl &select_proxy ( ::CORBA::DomainManager *object ACE_ENV_ARG_DECL ); @@ -153,7 +156,7 @@ // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. - _TAO_CORBA_DomainManager_Proxy_Impl + ::CORBA::_TAO_DomainManager_Proxy_Impl *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; TAO_SYNCH_MUTEX mutex_; @@ -175,8 +178,8 @@ // ThruPOA Impl. Declaration // - class TAO_Domain_Export _TAO_DomainManager_ThruPOA_Proxy_Impl : - public virtual _TAO_CORBA_DomainManager_Proxy_Impl, + class TAO_Export _TAO_DomainManager_ThruPOA_Proxy_Impl : + public virtual ::CORBA::_TAO_DomainManager_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl { public: @@ -184,8 +187,8 @@ virtual ~_TAO_DomainManager_ThruPOA_Proxy_Impl (void) { } - virtual CORBA::Policy_ptr get_domain_policy ( - CORBA::Object_ptr _collocated_tao_target_, + virtual ::CORBA::Policy_ptr get_domain_policy ( + CORBA_Object *_collocated_tao_target_, CORBA::PolicyType policy_type ACE_ENV_ARG_DECL ) @@ -201,182 +204,250 @@ /////////////////////////////////////////////////////////////////////// - class POA_CORBA_ConstructionPolicy; - typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr; - // Forward Classes Declaration - class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl; - class _TAO_ConstructionPolicy_Strategized_Proxy_Broker; +/////////////////////////////////////////////////////////////////////// +// Direct Impl. Declaration +// - class TAO_Domain_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA_Policy - { - protected: - POA_CORBA_ConstructionPolicy (void); +class TAO_Export _TAO_DomainManager_Direct_Proxy_Impl : + public virtual CORBA::_TAO_DomainManager_Proxy_Impl, + public virtual TAO_Direct_Object_Proxy_Impl +{ +public: + _TAO_DomainManager_Direct_Proxy_Impl (void); - public: - POA_CORBA_ConstructionPolicy (const POA_CORBA_ConstructionPolicy& rhs); - virtual ~POA_CORBA_ConstructionPolicy (void); + virtual ~_TAO_DomainManager_Direct_Proxy_Impl (void) { } + virtual ::CORBA::Policy_ptr get_domain_policy ( + CORBA_Object *_collocated_tao_target_, + CORBA::PolicyType policy_type + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + }; - virtual void* _downcast ( - const char* logical_type_id - ); +// +// Direct Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// - static void _is_a_skel ( - TAO_ServerRequest &req, - void *obj, - void *servant_upcall - ACE_ENV_ARG_DECL - ); - static void _non_existent_skel ( - TAO_ServerRequest &req, - void *obj, - void *servant_upcall - ACE_ENV_ARG_DECL - ); +class ConstructionPolicy; +typedef ConstructionPolicy *ConstructionPolicy_ptr; +// Forward Classes Declaration +class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl; +class _TAO_ConstructionPolicy_Direct_Proxy_Impl; +class _TAO_ConstructionPolicy_Strategized_Proxy_Broker; - static void _interface_skel ( - TAO_ServerRequest &req, - void *obj, - void *servant_upcall - ACE_ENV_ARG_DECL - ); +class TAO_Export ConstructionPolicy + : public virtual POA_CORBA::Policy +{ +protected: + ConstructionPolicy (void); - virtual void _dispatch ( - TAO_ServerRequest &req, - void *_servant_upcall - ACE_ENV_ARG_DECL - ); +public: + ConstructionPolicy (const ConstructionPolicy& rhs); + virtual ~ConstructionPolicy (void); - CORBA_ConstructionPolicy *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); - virtual const char* _interface_repository_id (void) const; + virtual void* _downcast ( + const char* logical_type_id + ); - virtual void make_domain_manager ( - CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + static void _is_a_skel ( + TAO_ServerRequest &req, + void *obj, + void *servant_upcall + ACE_ENV_ARG_DECL + ); - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + static void _non_existent_skel ( + TAO_ServerRequest &req, + void *obj, + void *servant_upcall + ACE_ENV_ARG_DECL + ); + + static void _interface_skel ( + TAO_ServerRequest &req, + void *obj, + void *servant_upcall + ACE_ENV_ARG_DECL + ); + + virtual void _dispatch ( + TAO_ServerRequest &req, + void *_servant_upcall + ACE_ENV_ARG_DECL + ); + + ::CORBA::ConstructionPolicy *_this ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); + + virtual const char* _interface_repository_id (void) const; + + virtual void make_domain_manager ( + CORBA::InterfaceDef_ptr object_type, + CORBA::Boolean constr_policy + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; static void make_domain_manager_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_servant_upcall - ACE_ENV_ARG_DECL - ); + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_servant_upcall + ACE_ENV_ARG_DECL + ); - static void _get_policy_type_skel ( - TAO_ServerRequest &req, - void *obj, - void *context - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + static void _get_policy_type_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static void copy_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); - static void copy_skel ( - TAO_ServerRequest &req, - void *obj, - void *context - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + static void destroy_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); - static void destroy_skel ( - TAO_ServerRequest &req, - void *obj, - void *context - ACE_ENV_ARG_DECL_WITH_DEFAULTS); +}; +/////////////////////////////////////////////////////////////////////// +// Strategized Proxy Broker Declaration +// - }; +class TAO_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Broker +{ +public: + _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); + virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); - /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration - // + virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl &select_proxy ( + ::CORBA::ConstructionPolicy *object + ACE_ENV_ARG_DECL + ); - class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Broker - { - public: - _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); +private: + // Helper methods that takes care to create the proxy + // as soon as their use is necessary. + void create_proxy ( + int collocation_strategy + ACE_ENV_ARG_DECL + ); - virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); + // Caches the proxy implementations. The proxy implementation + // are totally stateless, and those can be shared by all the + // instances of a given IDL interface type. + ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; - virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy ( - CORBA_ConstructionPolicy *object - ACE_ENV_ARG_DECL - ); + TAO_SYNCH_MUTEX mutex_; + // This funxtion is used to get an handle to the unique instance + // of the Strategized Proxy Broker that is available for a given + // interface. - private: - // Helper methods that takes care to create the proxy - // as soon as their use is necessary. - void create_proxy ( - int collocation_strategy - ACE_ENV_ARG_DECL - ); +public: + static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); +}; - // Caches the proxy implementations. The proxy implementation - // are totally stateless, and those can be shared by all the - // instances of a given IDL interface type. - _TAO_CORBA_ConstructionPolicy_Proxy_Impl - *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; - TAO_SYNCH_MUTEX mutex_; - // This funxtion is used to get an handle to the unique instance - // of the Strategized Proxy Broker that is available for a given - // interface. +// +// End Strategized Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// - public: - static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void); - }; +/////////////////////////////////////////////////////////////////////// +// ThruPOA Impl. Declaration +// - // - // End Strategized Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// +class TAO_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl : + public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl, + public virtual TAO_ThruPOA_Object_Proxy_Impl, + public virtual ::POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl +{ +public: + _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void); - /////////////////////////////////////////////////////////////////////// - // ThruPOA Impl. Declaration - // + virtual ~_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void) { } - class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl : - public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl, - public virtual TAO_ThruPOA_Object_Proxy_Impl, - public virtual POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl + virtual void make_domain_manager ( + CORBA_Object *_collocated_tao_target_, + CORBA::InterfaceDef_ptr object_type, + CORBA::Boolean constr_policy + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); - { - public: - _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void); - virtual ~_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void) { } +}; - virtual void make_domain_manager ( - CORBA::Object_ptr _collocated_tao_target_, - CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); +// +// ThruPOA Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Direct Impl. Declaration +// + +class TAO_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl : + public virtual CORBA::_TAO_ConstructionPolicy_Proxy_Impl, + public virtual TAO_Direct_Object_Proxy_Impl, + public virtual POA_CORBA::_TAO_Policy_Direct_Proxy_Impl + +{ +public: + _TAO_ConstructionPolicy_Direct_Proxy_Impl (void); + virtual ~_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) { } + + virtual void make_domain_manager ( + CORBA_Object *_collocated_tao_target_, + CORBA::InterfaceDef_ptr object_type, + CORBA::Boolean constr_policy + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); }; - // - // ThruPOA Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// +// +// Direct Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +} +TAO_NAMESPACE_CLOSE // module CORBA #include "DomainS_T.h" diff --git a/TAO/tao/Domain/DomainS.i b/TAO/tao/Domain/DomainS.i index e3270650796..b7ba296aa77 100644 --- a/TAO/tao/Domain/DomainS.i +++ b/TAO/tao/Domain/DomainS.i @@ -19,48 +19,48 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -ACE_INLINE void POA_CORBA_ConstructionPolicy::_get_policy_type_skel ( +ACE_INLINE void POA_CORBA::ConstructionPolicy::_get_policy_type_skel ( TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL ) { - POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; - POA_CORBA_Policy::_get_policy_type_skel ( + POA_CORBA::Policy_ptr impl = (POA_CORBA::ConstructionPolicy_ptr) obj; + POA_CORBA::Policy::_get_policy_type_skel ( req, - (POA_CORBA_Policy_ptr) impl, + (POA_CORBA::Policy_ptr) impl, context ACE_ENV_ARG_PARAMETER ); } -ACE_INLINE void POA_CORBA_ConstructionPolicy::copy_skel ( +ACE_INLINE void POA_CORBA::ConstructionPolicy::copy_skel ( TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL ) { - POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; - POA_CORBA_Policy::copy_skel ( + POA_CORBA::Policy_ptr impl = (POA_CORBA::ConstructionPolicy_ptr) obj; + POA_CORBA::Policy::copy_skel ( req, - (POA_CORBA_Policy_ptr) impl, + (POA_CORBA::Policy_ptr) impl, context - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } -ACE_INLINE void POA_CORBA_ConstructionPolicy::destroy_skel ( +ACE_INLINE void POA_CORBA::ConstructionPolicy::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL ) { - POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; - POA_CORBA_Policy::destroy_skel ( + POA_CORBA::Policy_ptr impl = (POA_CORBA::ConstructionPolicy_ptr) obj; + POA_CORBA::Policy::destroy_skel ( req, - (POA_CORBA_Policy_ptr) impl, + (POA_CORBA::Policy_ptr) impl, context - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/tao/Domain/DomainS_T.cpp b/TAO/tao/Domain/DomainS_T.cpp index 9fcddd72ad1..c1f98b3d8b2 100644 --- a/TAO/tao/Domain/DomainS_T.cpp +++ b/TAO/tao/Domain/DomainS_T.cpp @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_DOMAINS_T_CPP_ -#define _TAO_IDL_DOMAINS_T_CPP_ +#ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_ +#define _TAO_IDL_ORIG_DOMAINS_T_CPP_ #include "DomainS_T.h" diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h index 438a6e9a4ef..fad7b4a73d7 100644 --- a/TAO/tao/Domain/DomainS_T.h +++ b/TAO/tao/Domain/DomainS_T.h @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_DOMAINS_T_H_ -#define _TAO_IDL_DOMAINS_T_H_ +#ifndef _TAO_IDL_ORIG_DOMAINS_T_H_ +#define _TAO_IDL_ORIG_DOMAINS_T_H_ #include "ace/pre.h" #if defined(_MSC_VER) @@ -31,23 +31,24 @@ #endif /* _MSC_VER */ #if defined (ACE_HAS_USING_KEYWORD) - +TAO_NAMESPACE POA_CORBA +{ // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> - class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager + class TAO_Export DomainManager_tie : public DomainManager { public: - POA_CORBA_DomainManager_tie (T &t); + DomainManager_tie (T &t); // the T& ctor - POA_CORBA_DomainManager_tie (T &t, PortableServer::POA_ptr poa); + DomainManager_tie (T &t, PortableServer::POA_ptr poa); // ctor taking a POA - POA_CORBA_DomainManager_tie (T *tp, CORBA::Boolean release=1); + DomainManager_tie (T *tp, CORBA::Boolean release=1); // ctor taking pointer and an ownership flag - POA_CORBA_DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); + DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); // ctor with T*, ownership flag and a POA - ~POA_CORBA_DomainManager_tie (void); + ~DomainManager_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -59,45 +60,45 @@ // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - - CORBA::Policy_ptr get_domain_policy ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); + ::CORBA::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - private: + + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed - POA_CORBA_DomainManager_tie (const POA_CORBA_DomainManager_tie &); - void operator= (const POA_CORBA_DomainManager_tie &); + DomainManager_tie (const DomainManager_tie &); + void operator= (const DomainManager_tie &); }; // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> - class TAO_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy + class TAO_Export ConstructionPolicy_tie : public ConstructionPolicy { public: - POA_CORBA_ConstructionPolicy_tie (T &t); + ConstructionPolicy_tie (T &t); // the T& ctor - POA_CORBA_ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa); + ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa); // ctor taking a POA - POA_CORBA_ConstructionPolicy_tie (T *tp, CORBA::Boolean release=1); + ConstructionPolicy_tie (T *tp, CORBA::Boolean release=1); // ctor taking pointer and an ownership flag - POA_CORBA_ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); + ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); // ctor with T*, ownership flag and a POA - ~POA_CORBA_ConstructionPolicy_tie (void); + ~ConstructionPolicy_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -109,52 +110,56 @@ // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); void make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - CORBA::PolicyType policy_type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + CORBA::PolicyType policy_type ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ::CORBA::Policy_ptr copy ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + void destroy ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - private: + + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed - POA_CORBA_ConstructionPolicy_tie (const POA_CORBA_ConstructionPolicy_tie &); - void operator= (const POA_CORBA_ConstructionPolicy_tie &); + ConstructionPolicy_tie (const ConstructionPolicy_tie &); + void operator= (const ConstructionPolicy_tie &); }; - +} +TAO_NAMESPACE_CLOSE // module CORBA #endif /* ACE_HAS_USING_KEYWORD */ #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Domain/DomainS_T.i b/TAO/tao/Domain/DomainS_T.i index c48f6480cad..48d19cf6f72 100644 --- a/TAO/tao/Domain/DomainS_T.i +++ b/TAO/tao/Domain/DomainS_T.i @@ -22,47 +22,47 @@ #if defined (ACE_HAS_USING_KEYWORD) template <class T> ACE_INLINE -POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) +POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE -POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) +POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t, PortableServer::POA_ptr poa) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE -POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) +POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, CORBA::Boolean release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE -POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) +POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE -POA_CORBA_DomainManager_tie<T>::~POA_CORBA_DomainManager_tie (void) +POA_CORBA::DomainManager_tie<T>::~DomainManager_tie (void) { if (this->rel_) delete this->ptr_; } template <class T> ACE_INLINE T * -POA_CORBA_DomainManager_tie<T>::_tied_object (void) +POA_CORBA::DomainManager_tie<T>::_tied_object (void) { return this->ptr_; } template <class T> ACE_INLINE void -POA_CORBA_DomainManager_tie<T>::_tied_object (T &obj) +POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj) { if (this->rel_) delete this->ptr_; this->ptr_ = &obj; @@ -70,7 +70,7 @@ POA_CORBA_DomainManager_tie<T>::_tied_object (T &obj) } template <class T> ACE_INLINE void -POA_CORBA_DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release) +POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release) { if (this->rel_) delete this->ptr_; this->ptr_ = obj; @@ -78,28 +78,28 @@ POA_CORBA_DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release) } template <class T> ACE_INLINE CORBA::Boolean -POA_CORBA_DomainManager_tie<T>::_is_owner (void) +POA_CORBA::DomainManager_tie<T>::_is_owner (void) { return this->rel_; } template <class T> ACE_INLINE void -POA_CORBA_DomainManager_tie<T>::_is_owner (CORBA::Boolean b) +POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b) { this->rel_ = b; } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE -CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy ( +::CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy ( CORBA::PolicyType policy_type ACE_ENV_ARG_DECL ) @@ -108,53 +108,56 @@ CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy ( )) { return this->ptr_->get_domain_policy ( -policy_type - ACE_ENV_ARG_PARAMETER +policy_type ACE_ENV_ARG_PARAMETER ); } +#endif /* ACE_HAS_USING_KEYWORD */ + +#if defined (ACE_HAS_USING_KEYWORD) + template <class T> ACE_INLINE -POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) +POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE -POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) +POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE -POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) +POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, CORBA::Boolean release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE -POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) +POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE -POA_CORBA_ConstructionPolicy_tie<T>::~POA_CORBA_ConstructionPolicy_tie (void) +POA_CORBA::ConstructionPolicy_tie<T>::~ConstructionPolicy_tie (void) { if (this->rel_) delete this->ptr_; } template <class T> ACE_INLINE T * -POA_CORBA_ConstructionPolicy_tie<T>::_tied_object (void) +POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (void) { return this->ptr_; } template <class T> ACE_INLINE void -POA_CORBA_ConstructionPolicy_tie<T>::_tied_object (T &obj) +POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj) { if (this->rel_) delete this->ptr_; this->ptr_ = &obj; @@ -162,7 +165,7 @@ POA_CORBA_ConstructionPolicy_tie<T>::_tied_object (T &obj) } template <class T> ACE_INLINE void -POA_CORBA_ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release) +POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release) { if (this->rel_) delete this->ptr_; this->ptr_ = obj; @@ -170,28 +173,28 @@ POA_CORBA_ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean releas } template <class T> ACE_INLINE CORBA::Boolean -POA_CORBA_ConstructionPolicy_tie<T>::_is_owner (void) +POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (void) { return this->rel_; } template <class T> ACE_INLINE void -POA_CORBA_ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b) +POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b) { this->rel_ = b; } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE -void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager ( +void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy ACE_ENV_ARG_DECL @@ -202,13 +205,13 @@ void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager ( { this->ptr_->make_domain_manager ( object_type, - constr_policy - ACE_ENV_ARG_PARAMETER + constr_policy ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE -CORBA::PolicyType POA_CORBA_ConstructionPolicy_tie<T>::policy_type ( +CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -221,7 +224,8 @@ ACE_ENV_SINGLE_ARG_PARAMETER } template <class T> ACE_INLINE -CORBA::Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy ( +::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -234,7 +238,8 @@ ACE_ENV_SINGLE_ARG_PARAMETER } template <class T> ACE_INLINE -void POA_CORBA_ConstructionPolicy_tie<T>::destroy ( +void POA_CORBA::ConstructionPolicy_tie<T>::destroy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -247,3 +252,4 @@ ACE_ENV_SINGLE_ARG_PARAMETER } #endif /* ACE_HAS_USING_KEYWORD */ + diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 8adea9e92ab..76e26f8e703 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -35,46 +35,46 @@ #include "ace/Dynamic_Service.h" #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) #include "DomainC.i" #endif /* !defined INLINE */ -int CORBA_DomainManager::_tao_class_id = 0; +int CORBA::DomainManager::_tao_class_id = 0; -CORBA_DomainManager_ptr +CORBA::DomainManager_ptr tao_CORBA_DomainManager_duplicate ( - CORBA_DomainManager_ptr p + CORBA::DomainManager_ptr p ) { - return CORBA_DomainManager::_duplicate (p); + return CORBA::DomainManager::_duplicate (p); } void tao_CORBA_DomainManager_release ( - CORBA_DomainManager_ptr p + CORBA::DomainManager_ptr p ) { CORBA::release (p); } -CORBA_DomainManager_ptr +CORBA::DomainManager_ptr tao_CORBA_DomainManager_nil ( void ) { - return CORBA_DomainManager::_nil (); + return CORBA::DomainManager::_nil (); } -CORBA_DomainManager_ptr +CORBA::DomainManager_ptr tao_CORBA_DomainManager_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return CORBA_DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -82,189 +82,193 @@ tao_CORBA_DomainManager_upcast ( void *src ) { - CORBA_DomainManager **tmp = - ACE_static_cast (CORBA_DomainManager **, src); + CORBA::DomainManager **tmp = + ACE_static_cast (CORBA::DomainManager **, src); return *tmp; } // ************************************************************* -// Operations for class CORBA_DomainManager_var +// CORBA::DomainManager_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* -CORBA_DomainManager_var::CORBA_DomainManager_var (void) // default constructor - : ptr_ (CORBA_DomainManager::_nil ()) +CORBA::DomainManager_var::DomainManager_var (void) // default constructor + : ptr_ (DomainManager::_nil ()) {} -::CORBA_DomainManager_ptr -CORBA_DomainManager_var::ptr (void) const +::CORBA::DomainManager_ptr +CORBA::DomainManager_var::ptr (void) const { return this->ptr_; } -CORBA_DomainManager_var::CORBA_DomainManager_var (const ::CORBA_DomainManager_var &p) // copy constructor +CORBA::DomainManager_var::DomainManager_var (const ::CORBA::DomainManager_var &p) // copy constructor : TAO_Base_var (), - ptr_ (CORBA_DomainManager::_duplicate (p.ptr ())) + ptr_ (DomainManager::_duplicate (p.ptr ())) {} -CORBA_DomainManager_var::~CORBA_DomainManager_var (void) // destructor +CORBA::DomainManager_var::~DomainManager_var (void) // destructor { CORBA::release (this->ptr_); } -CORBA_DomainManager_var & -CORBA_DomainManager_var::operator= (CORBA_DomainManager_ptr p) +CORBA::DomainManager_var & +CORBA::DomainManager_var::operator= (DomainManager_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -CORBA_DomainManager_var & -CORBA_DomainManager_var::operator= (const ::CORBA_DomainManager_var &p) +CORBA::DomainManager_var & +CORBA::DomainManager_var::operator= (const ::CORBA::DomainManager_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_DomainManager::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::DomainManager::_duplicate (p.ptr ()); } return *this; } -CORBA_DomainManager_var::operator const ::CORBA_DomainManager_ptr &() const // cast +CORBA::DomainManager_var::operator const ::CORBA::DomainManager_ptr &() const // cast { return this->ptr_; } -CORBA_DomainManager_var::operator ::CORBA_DomainManager_ptr &() // cast +CORBA::DomainManager_var::operator ::CORBA::DomainManager_ptr &() // cast { return this->ptr_; } -::CORBA_DomainManager_ptr -CORBA_DomainManager_var::operator-> (void) const +::CORBA::DomainManager_ptr +CORBA::DomainManager_var::operator-> (void) const { return this->ptr_; } -::CORBA_DomainManager_ptr -CORBA_DomainManager_var::in (void) const +::CORBA::DomainManager_ptr +CORBA::DomainManager_var::in (void) const { return this->ptr_; } -::CORBA_DomainManager_ptr & -CORBA_DomainManager_var::inout (void) +::CORBA::DomainManager_ptr & +CORBA::DomainManager_var::inout (void) { return this->ptr_; } -::CORBA_DomainManager_ptr & -CORBA_DomainManager_var::out (void) +::CORBA::DomainManager_ptr & +CORBA::DomainManager_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_DomainManager::_nil (); + this->ptr_ = ::CORBA::DomainManager::_nil (); return this->ptr_; } -::CORBA_DomainManager_ptr -CORBA_DomainManager_var::_retn (void) +::CORBA::DomainManager_ptr +CORBA::DomainManager_var::_retn (void) { // yield ownership of managed obj reference - ::CORBA_DomainManager_ptr val = this->ptr_; - this->ptr_ = ::CORBA_DomainManager::_nil (); + ::CORBA::DomainManager_ptr val = this->ptr_; + this->ptr_ = ::CORBA::DomainManager::_nil (); return val; } -::CORBA_DomainManager_ptr -CORBA_DomainManager_var::tao_duplicate (CORBA_DomainManager_ptr p) +::CORBA::DomainManager_ptr +CORBA::DomainManager_var::tao_duplicate (DomainManager_ptr p) { - return ::CORBA_DomainManager::_duplicate (p); + return ::CORBA::DomainManager::_duplicate (p); } void -CORBA_DomainManager_var::tao_release (CORBA_DomainManager_ptr p) +CORBA::DomainManager_var::tao_release (DomainManager_ptr p) { CORBA::release (p); } -::CORBA_DomainManager_ptr -CORBA_DomainManager_var::tao_nil (void) +::CORBA::DomainManager_ptr +CORBA::DomainManager_var::tao_nil (void) { - return ::CORBA_DomainManager::_nil (); + return ::CORBA::DomainManager::_nil (); } -::CORBA_DomainManager_ptr -CORBA_DomainManager_var::tao_narrow ( +::CORBA::DomainManager_ptr +CORBA::DomainManager_var::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA_DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::CORBA::DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA_DomainManager_var::tao_upcast (void *src) +CORBA::DomainManager_var::tao_upcast (void *src) { - CORBA_DomainManager **tmp = - ACE_static_cast (CORBA_DomainManager **, src); + DomainManager **tmp = + ACE_static_cast (DomainManager **, src); return *tmp; } // ************************************************************* -// Operations for class CORBA_DomainManager_out +// CORBA::DomainManager_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* -CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_ptr &p) +CORBA::DomainManager_out::DomainManager_out (DomainManager_ptr &p) : ptr_ (p) { - this->ptr_ = ::CORBA_DomainManager::_nil (); + this->ptr_ = ::CORBA::DomainManager::_nil (); } -CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_var &p) // constructor from _var +CORBA::DomainManager_out::DomainManager_out (DomainManager_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_DomainManager::_nil (); + this->ptr_ = ::CORBA::DomainManager::_nil (); } -CORBA_DomainManager_out::CORBA_DomainManager_out (const ::CORBA_DomainManager_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_DomainManager_out &, p).ptr_) +CORBA::DomainManager_out::DomainManager_out (const ::CORBA::DomainManager_out &p) // copy constructor + : ptr_ (ACE_const_cast (DomainManager_out &, p).ptr_) {} -::CORBA_DomainManager_out & -CORBA_DomainManager_out::operator= (const ::CORBA_DomainManager_out &p) +::CORBA::DomainManager_out & +CORBA::DomainManager_out::operator= (const ::CORBA::DomainManager_out &p) { - this->ptr_ = ACE_const_cast (CORBA_DomainManager_out&, p).ptr_; + this->ptr_ = ACE_const_cast (DomainManager_out&, p).ptr_; return *this; } -CORBA_DomainManager_out & -CORBA_DomainManager_out::operator= (const ::CORBA_DomainManager_var &p) +CORBA::DomainManager_out & +CORBA::DomainManager_out::operator= (const ::CORBA::DomainManager_var &p) { - this->ptr_ = ::CORBA_DomainManager::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::DomainManager::_duplicate (p.ptr ()); return *this; } -CORBA_DomainManager_out & -CORBA_DomainManager_out::operator= (CORBA_DomainManager_ptr p) +CORBA::DomainManager_out & +CORBA::DomainManager_out::operator= (DomainManager_ptr p) { this->ptr_ = p; return *this; } -CORBA_DomainManager_out::operator ::CORBA_DomainManager_ptr &() // cast +CORBA::DomainManager_out::operator ::CORBA::DomainManager_ptr &() // cast { return this->ptr_; } -::CORBA_DomainManager_ptr & -CORBA_DomainManager_out::ptr (void) // ptr +::CORBA::DomainManager_ptr & +CORBA::DomainManager_out::ptr (void) // ptr { return this->ptr_; } -::CORBA_DomainManager_ptr -CORBA_DomainManager_out::operator-> (void) +::CORBA::DomainManager_ptr +CORBA::DomainManager_out::operator-> (void) { return this->ptr_; } @@ -277,23 +281,16 @@ public: TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::PolicyType & policy_type - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Policy_ptr result); @@ -309,8 +306,7 @@ private: TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::PolicyType & policy_type - ACE_ENV_ARG_DECL_NOT_USED + const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), policy_type_ (policy_type) @@ -330,7 +326,7 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_ parameter_list->length (1); CORBA::ULong len = 0; - (*parameter_list)[len].argument <<= this->policy_type_; + (*parameter_list)[len].argument <<= policy_type_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -349,7 +345,6 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV return exception_list; } - CORBA::Any * TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -367,7 +362,7 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SIN } void -TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Policy_ptr result) +TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result) { // update the result this->_result = result; @@ -379,16 +374,16 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Poli // Base & Remote Proxy Implementation. // -_TAO_CORBA_DomainManager_Proxy_Impl::_TAO_CORBA_DomainManager_Proxy_Impl (void) +CORBA::_TAO_DomainManager_Proxy_Impl::_TAO_DomainManager_Proxy_Impl (void) {} -_TAO_CORBA_DomainManager_Remote_Proxy_Impl::_TAO_CORBA_DomainManager_Remote_Proxy_Impl (void) +CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Impl (void) {} // Remote Implementation of the IDL interface methods -CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ( - CORBA::Object_ptr _collocated_tao_target_, +::CORBA::Policy_ptr CORBA::_TAO_DomainManager_Remote_Proxy_Impl::get_domain_policy ( + CORBA_Object *_collocated_tao_target_, CORBA::PolicyType policy_type ACE_ENV_ARG_DECL ) @@ -397,13 +392,13 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy )) { - CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil (); - CORBA::Policy_var _tao_safe_retval (_tao_retval); + CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ()); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), 0); + ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ()); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -430,27 +425,26 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy _invoke_status = TAO_INVOKE_EXCEPTION; #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy ri ( + TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri ( &_tao_call, _collocated_tao_target_, - policy_type - ACE_ENV_ARG_PARAMETER + policy_type ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (_tao_retval._retn ()); #endif /* TAO_HAS_INTERCEPTORS */ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); #if TAO_HAS_INTERCEPTORS == 1 ACE_TRY { _tao_vfr.send_request ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -463,13 +457,13 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy #endif /* TAO_HAS_INTERCEPTORS */ _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -482,7 +476,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); if (_invoke_status == TAO_INVOKE_EXCEPTION) { @@ -495,10 +489,10 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -508,7 +502,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( - (_tao_in >> _tao_safe_retval.inout ()) + (_tao_in >> _tao_retval.inout ()) )) { TAO_INTERCEPTOR_THROW_RETURN ( @@ -519,29 +513,29 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy } #if TAO_HAS_INTERCEPTORS == 1 - CORBA::Policy_ptr _tao_retval_info = _tao_safe_retval._retn (); - ri.result (_tao_retval_info); - _tao_safe_retval = _tao_retval_info; + ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn (); + _tao_ri.result (_tao_retval_info); + _tao_retval = _tao_retval_info; - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -549,11 +543,11 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (_tao_retval._retn ()); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval._retn ()); if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) @@ -563,7 +557,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy break; } -return _tao_safe_retval._retn (); +return _tao_retval._retn (); } @@ -576,37 +570,37 @@ return _tao_safe_retval._retn (); // Remote & Base Proxy Broker Implementation // -_TAO_CORBA_DomainManager_Proxy_Broker::_TAO_CORBA_DomainManager_Proxy_Broker (void) +CORBA::_TAO_DomainManager_Proxy_Broker::_TAO_DomainManager_Proxy_Broker (void) { } -_TAO_CORBA_DomainManager_Proxy_Broker::~_TAO_CORBA_DomainManager_Proxy_Broker (void) +CORBA::_TAO_DomainManager_Proxy_Broker::~_TAO_DomainManager_Proxy_Broker (void) { } -_TAO_CORBA_DomainManager_Proxy_Broker * (*CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) ( +CORBA::_TAO_DomainManager_Proxy_Broker * (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; // Factory Member function Implementation. -_TAO_CORBA_DomainManager_Remote_Proxy_Broker * -_TAO_CORBA_DomainManager_Remote_Proxy_Broker::the_TAO_CORBA_DomainManager_Remote_Proxy_Broker (void) +CORBA::_TAO_DomainManager_Remote_Proxy_Broker * +CORBA::_TAO_DomainManager_Remote_Proxy_Broker::the_TAO_DomainManager_Remote_Proxy_Broker (void) { - static ::_TAO_CORBA_DomainManager_Remote_Proxy_Broker remote_proxy_broker; + static ::CORBA::_TAO_DomainManager_Remote_Proxy_Broker remote_proxy_broker; return &remote_proxy_broker; } -_TAO_CORBA_DomainManager_Remote_Proxy_Broker::_TAO_CORBA_DomainManager_Remote_Proxy_Broker (void) +CORBA::_TAO_DomainManager_Remote_Proxy_Broker::_TAO_DomainManager_Remote_Proxy_Broker (void) { } -_TAO_CORBA_DomainManager_Remote_Proxy_Broker::~_TAO_CORBA_DomainManager_Remote_Proxy_Broker (void) +CORBA::_TAO_DomainManager_Remote_Proxy_Broker::~_TAO_DomainManager_Remote_Proxy_Broker (void) { } -_TAO_CORBA_DomainManager_Proxy_Impl& -_TAO_CORBA_DomainManager_Remote_Proxy_Broker::select_proxy ( - ::CORBA_DomainManager * +CORBA::_TAO_DomainManager_Proxy_Impl& +CORBA::_TAO_DomainManager_Remote_Proxy_Broker::select_proxy ( + ::CORBA::DomainManager * ACE_ENV_ARG_DECL_NOT_USED ) { @@ -619,79 +613,81 @@ _TAO_CORBA_DomainManager_Remote_Proxy_Broker::select_proxy ( /////////////////////////////////////////////////////////////////////// -// default constructor -CORBA_DomainManager::CORBA_DomainManager (int collocated) +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +CORBA::DomainManager::DomainManager (int collocated) { this->CORBA_DomainManager_setup_collocation (collocated); } -// destructor -CORBA_DomainManager::~CORBA_DomainManager (void) +CORBA::DomainManager::~DomainManager (void) {} void -CORBA_DomainManager::CORBA_DomainManager_setup_collocation (int collocated) +CORBA::DomainManager::CORBA_DomainManager_setup_collocation (int collocated) { if (collocated) - this->the_TAO_CORBA_DomainManager_Proxy_Broker_ = - ::CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer (this); + this->the_TAO_DomainManager_Proxy_Broker_ = + ::CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer (this); else - this->the_TAO_CORBA_DomainManager_Proxy_Broker_ = - ::_TAO_CORBA_DomainManager_Remote_Proxy_Broker::the_TAO_CORBA_DomainManager_Remote_Proxy_Broker (); + this->the_TAO_DomainManager_Proxy_Broker_ = + ::CORBA::_TAO_DomainManager_Remote_Proxy_Broker::the_TAO_DomainManager_Remote_Proxy_Broker (); } -void CORBA_DomainManager::_tao_any_destructor (void *x) +void CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer) { - CORBA_DomainManager *tmp = ACE_static_cast (CORBA_DomainManager*,x); + DomainManager *tmp = ACE_static_cast (DomainManager*, _tao_void_pointer); CORBA::release (tmp); } -CORBA_DomainManager_ptr CORBA_DomainManager::_narrow ( +CORBA::DomainManager_ptr CORBA::DomainManager::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) - return CORBA_DomainManager::_nil (); + return DomainManager::_nil (); if (! obj->_is_local ()) { CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_DomainManager::_nil ()); + ACE_CHECK_RETURN (DomainManager::_nil ()); if (is_a == 0) - return CORBA_DomainManager::_nil (); + return DomainManager::_nil (); } - return CORBA_DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow ( +CORBA::DomainManager_ptr +CORBA::DomainManager::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) - return CORBA_DomainManager::_nil (); + return DomainManager::_nil (); if (! obj->_is_local ()) { TAO_Stub* stub = obj->_stubobj (); if (stub) stub->_incr_refcnt (); - - CORBA_DomainManager_ptr default_proxy = CORBA_DomainManager::_nil (); + DomainManager_ptr default_proxy = DomainManager::_nil (); if ( !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () &&CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer != 0 + obj->_is_collocated () && + CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer != 0 ) { ACE_NEW_RETURN ( default_proxy, - ::CORBA_DomainManager ( + ::CORBA::DomainManager ( stub, 1, obj->_servant () ), - CORBA_DomainManager::_nil () + DomainManager::_nil () ); } @@ -699,42 +695,42 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow ( { ACE_NEW_RETURN ( default_proxy, - ::CORBA_DomainManager ( + ::CORBA::DomainManager ( stub, 0, obj->_servant () ), - CORBA_DomainManager::_nil () + DomainManager::_nil () ); } return default_proxy; - } - else - return - ACE_reinterpret_cast - ( - CORBA_DomainManager_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &CORBA_DomainManager::_tao_class_id - ) - ) - ); + } + else + return + ACE_reinterpret_cast + ( + DomainManager_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &DomainManager::_tao_class_id + ) + ) + ); } -CORBA_DomainManager_ptr -CORBA_DomainManager::_duplicate (CORBA_DomainManager_ptr obj) +CORBA::DomainManager_ptr +CORBA::DomainManager::_duplicate (DomainManager_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) +CORBA::Boolean CORBA::DomainManager::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) || @@ -744,12 +740,12 @@ CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value ACE_ENV_ARG_ return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } -void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::DomainManager::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_DomainManager::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, DomainManager)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, @@ -760,12 +756,12 @@ void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type) return retv; } -const char* CORBA_DomainManager::_interface_repository_id (void) const +const char* CORBA::DomainManager::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/DomainManager:1.0"; } -CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy ( +::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy ( CORBA::PolicyType policy_type ACE_ENV_ARG_DECL ) @@ -773,14 +769,13 @@ CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy ( CORBA::SystemException )) { - _TAO_CORBA_DomainManager_Proxy_Impl &proxy = - this->the_TAO_CORBA_DomainManager_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); + _TAO_DomainManager_Proxy_Impl &proxy = + this->the_TAO_DomainManager_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.get_domain_policy ( this, - policy_type - ACE_ENV_ARG_PARAMETER + policy_type ACE_ENV_ARG_PARAMETER ); } @@ -809,50 +804,51 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager ( sizeof (_oc_CORBA_DomainManager), (char *) &_oc_CORBA_DomainManager, 0, - sizeof (CORBA_DomainManager) + sizeof (CORBA::DomainManager) ); -CORBA::TypeCode_ptr _tc_CORBA_DomainManager = - &_tc_TAO_tc_CORBA_DomainManager; +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (CORBA) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_DomainManager, &_tc_TAO_tc_CORBA_DomainManager) +TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (CORBA) TAO_NAMESPACE_DEFINE (const CORBA::ULong, SecConstruction, 11U) TAO_NAMESPACE_END +int CORBA::ConstructionPolicy::_tao_class_id = 0; -int CORBA_ConstructionPolicy::_tao_class_id = 0; - -CORBA_ConstructionPolicy_ptr +CORBA::ConstructionPolicy_ptr tao_CORBA_ConstructionPolicy_duplicate ( - CORBA_ConstructionPolicy_ptr p + CORBA::ConstructionPolicy_ptr p ) { - return CORBA_ConstructionPolicy::_duplicate (p); + return CORBA::ConstructionPolicy::_duplicate (p); } void tao_CORBA_ConstructionPolicy_release ( - CORBA_ConstructionPolicy_ptr p + CORBA::ConstructionPolicy_ptr p ) { CORBA::release (p); } -CORBA_ConstructionPolicy_ptr +CORBA::ConstructionPolicy_ptr tao_CORBA_ConstructionPolicy_nil ( void ) { - return CORBA_ConstructionPolicy::_nil (); + return CORBA::ConstructionPolicy::_nil (); } -CORBA_ConstructionPolicy_ptr +CORBA::ConstructionPolicy_ptr tao_CORBA_ConstructionPolicy_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return CORBA_ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -860,189 +856,193 @@ tao_CORBA_ConstructionPolicy_upcast ( void *src ) { - CORBA_ConstructionPolicy **tmp = - ACE_static_cast (CORBA_ConstructionPolicy **, src); + CORBA::ConstructionPolicy **tmp = + ACE_static_cast (CORBA::ConstructionPolicy **, src); return *tmp; } // ************************************************************* -// Operations for class CORBA_ConstructionPolicy_var +// CORBA::ConstructionPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* -CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (void) // default constructor - : ptr_ (CORBA_ConstructionPolicy::_nil ()) +CORBA::ConstructionPolicy_var::ConstructionPolicy_var (void) // default constructor + : ptr_ (ConstructionPolicy::_nil ()) {} -::CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy_var::ptr (void) const +::CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy_var::ptr (void) const { return this->ptr_; } -CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (const ::CORBA_ConstructionPolicy_var &p) // copy constructor +CORBA::ConstructionPolicy_var::ConstructionPolicy_var (const ::CORBA::ConstructionPolicy_var &p) // copy constructor : TAO_Base_var (), - ptr_ (CORBA_ConstructionPolicy::_duplicate (p.ptr ())) + ptr_ (ConstructionPolicy::_duplicate (p.ptr ())) {} -CORBA_ConstructionPolicy_var::~CORBA_ConstructionPolicy_var (void) // destructor +CORBA::ConstructionPolicy_var::~ConstructionPolicy_var (void) // destructor { CORBA::release (this->ptr_); } -CORBA_ConstructionPolicy_var & -CORBA_ConstructionPolicy_var::operator= (CORBA_ConstructionPolicy_ptr p) +CORBA::ConstructionPolicy_var & +CORBA::ConstructionPolicy_var::operator= (ConstructionPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -CORBA_ConstructionPolicy_var & -CORBA_ConstructionPolicy_var::operator= (const ::CORBA_ConstructionPolicy_var &p) +CORBA::ConstructionPolicy_var & +CORBA::ConstructionPolicy_var::operator= (const ::CORBA::ConstructionPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_ConstructionPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::ConstructionPolicy::_duplicate (p.ptr ()); } return *this; } -CORBA_ConstructionPolicy_var::operator const ::CORBA_ConstructionPolicy_ptr &() const // cast +CORBA::ConstructionPolicy_var::operator const ::CORBA::ConstructionPolicy_ptr &() const // cast { return this->ptr_; } -CORBA_ConstructionPolicy_var::operator ::CORBA_ConstructionPolicy_ptr &() // cast +CORBA::ConstructionPolicy_var::operator ::CORBA::ConstructionPolicy_ptr &() // cast { return this->ptr_; } -::CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy_var::operator-> (void) const +::CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy_var::operator-> (void) const { return this->ptr_; } -::CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy_var::in (void) const +::CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy_var::in (void) const { return this->ptr_; } -::CORBA_ConstructionPolicy_ptr & -CORBA_ConstructionPolicy_var::inout (void) +::CORBA::ConstructionPolicy_ptr & +CORBA::ConstructionPolicy_var::inout (void) { return this->ptr_; } -::CORBA_ConstructionPolicy_ptr & -CORBA_ConstructionPolicy_var::out (void) +::CORBA::ConstructionPolicy_ptr & +CORBA::ConstructionPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_ConstructionPolicy::_nil (); + this->ptr_ = ::CORBA::ConstructionPolicy::_nil (); return this->ptr_; } -::CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy_var::_retn (void) +::CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy_var::_retn (void) { // yield ownership of managed obj reference - ::CORBA_ConstructionPolicy_ptr val = this->ptr_; - this->ptr_ = ::CORBA_ConstructionPolicy::_nil (); + ::CORBA::ConstructionPolicy_ptr val = this->ptr_; + this->ptr_ = ::CORBA::ConstructionPolicy::_nil (); return val; } -::CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy_var::tao_duplicate (CORBA_ConstructionPolicy_ptr p) +::CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy_var::tao_duplicate (ConstructionPolicy_ptr p) { - return ::CORBA_ConstructionPolicy::_duplicate (p); + return ::CORBA::ConstructionPolicy::_duplicate (p); } void -CORBA_ConstructionPolicy_var::tao_release (CORBA_ConstructionPolicy_ptr p) +CORBA::ConstructionPolicy_var::tao_release (ConstructionPolicy_ptr p) { CORBA::release (p); } -::CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy_var::tao_nil (void) +::CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy_var::tao_nil (void) { - return ::CORBA_ConstructionPolicy::_nil (); + return ::CORBA::ConstructionPolicy::_nil (); } -::CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy_var::tao_narrow ( +::CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy_var::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA_ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::CORBA::ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA_ConstructionPolicy_var::tao_upcast (void *src) +CORBA::ConstructionPolicy_var::tao_upcast (void *src) { - CORBA_ConstructionPolicy **tmp = - ACE_static_cast (CORBA_ConstructionPolicy **, src); + ConstructionPolicy **tmp = + ACE_static_cast (ConstructionPolicy **, src); return *tmp; } // ************************************************************* -// Operations for class CORBA_ConstructionPolicy_out +// CORBA::ConstructionPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* -CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &p) +CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = ::CORBA_ConstructionPolicy::_nil (); + this->ptr_ = ::CORBA::ConstructionPolicy::_nil (); } -CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_var &p) // constructor from _var +CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_ConstructionPolicy::_nil (); + this->ptr_ = ::CORBA::ConstructionPolicy::_nil (); } -CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (const ::CORBA_ConstructionPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_ConstructionPolicy_out &, p).ptr_) +CORBA::ConstructionPolicy_out::ConstructionPolicy_out (const ::CORBA::ConstructionPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (ConstructionPolicy_out &, p).ptr_) {} -::CORBA_ConstructionPolicy_out & -CORBA_ConstructionPolicy_out::operator= (const ::CORBA_ConstructionPolicy_out &p) +::CORBA::ConstructionPolicy_out & +CORBA::ConstructionPolicy_out::operator= (const ::CORBA::ConstructionPolicy_out &p) { - this->ptr_ = ACE_const_cast (CORBA_ConstructionPolicy_out&, p).ptr_; + this->ptr_ = ACE_const_cast (ConstructionPolicy_out&, p).ptr_; return *this; } -CORBA_ConstructionPolicy_out & -CORBA_ConstructionPolicy_out::operator= (const ::CORBA_ConstructionPolicy_var &p) +CORBA::ConstructionPolicy_out & +CORBA::ConstructionPolicy_out::operator= (const ::CORBA::ConstructionPolicy_var &p) { - this->ptr_ = ::CORBA_ConstructionPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::ConstructionPolicy::_duplicate (p.ptr ()); return *this; } -CORBA_ConstructionPolicy_out & -CORBA_ConstructionPolicy_out::operator= (CORBA_ConstructionPolicy_ptr p) +CORBA::ConstructionPolicy_out & +CORBA::ConstructionPolicy_out::operator= (ConstructionPolicy_ptr p) { this->ptr_ = p; return *this; } -CORBA_ConstructionPolicy_out::operator ::CORBA_ConstructionPolicy_ptr &() // cast +CORBA::ConstructionPolicy_out::operator ::CORBA::ConstructionPolicy_ptr &() // cast { return this->ptr_; } -::CORBA_ConstructionPolicy_ptr & -CORBA_ConstructionPolicy_out::ptr (void) // ptr +::CORBA::ConstructionPolicy_ptr & +CORBA::ConstructionPolicy_out::ptr (void) // ptr { return this->ptr_; } -::CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy_out::operator-> (void) +::CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy_out::operator-> (void) { return this->ptr_; } @@ -1055,31 +1055,24 @@ public: TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - CORBA_InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + CORBA::InterfaceDef_ptr object_type, + const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &); void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &); - CORBA_InterfaceDef_ptr object_type_; + CORBA::InterfaceDef_ptr object_type_; const CORBA::Boolean & constr_policy_; }; @@ -1087,9 +1080,8 @@ private: TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - CORBA_InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy - ACE_ENV_ARG_DECL_NOT_USED + CORBA::InterfaceDef_ptr object_type, + const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), object_type_ (object_type), @@ -1109,6 +1101,7 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A parameter_list->length (2); CORBA::ULong len = 0; + TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () @@ -1120,7 +1113,6 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A ); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -1140,7 +1132,6 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions ( return exception_list; } - CORBA::Any * TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -1160,17 +1151,17 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ // Base & Remote Proxy Implementation. // -_TAO_CORBA_ConstructionPolicy_Proxy_Impl::_TAO_CORBA_ConstructionPolicy_Proxy_Impl (void) +CORBA::_TAO_ConstructionPolicy_Proxy_Impl::_TAO_ConstructionPolicy_Proxy_Impl (void) {} -_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl (void) +CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) {} // Remote Implementation of the IDL interface methods -void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( - CORBA::Object_ptr _collocated_tao_target_, - CORBA_InterfaceDef_ptr object_type, +void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( + CORBA_Object *_collocated_tao_target_, + CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy ACE_ENV_ARG_DECL ) @@ -1191,7 +1182,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( istub, "make_domain_manager", 19, - 1, + 2, istub->orb_core () ); @@ -1216,28 +1207,27 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( _invoke_status = TAO_INVOKE_EXCEPTION; #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ri ( + TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri ( &_tao_call, _collocated_tao_target_, object_type, - constr_policy - ACE_ENV_ARG_PARAMETER + constr_policy ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); #if TAO_HAS_INTERCEPTORS == 1 ACE_TRY { _tao_vfr.send_request ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1250,13 +1240,13 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( #endif /* TAO_HAS_INTERCEPTORS */ _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -1269,7 +1259,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { @@ -1281,10 +1271,10 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1295,25 +1285,25 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( #if TAO_HAS_INTERCEPTORS == 1 - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1321,11 +1311,11 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) @@ -1348,37 +1338,37 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( // Remote & Base Proxy Broker Implementation // -_TAO_CORBA_ConstructionPolicy_Proxy_Broker::_TAO_CORBA_ConstructionPolicy_Proxy_Broker (void) +CORBA::_TAO_ConstructionPolicy_Proxy_Broker::_TAO_ConstructionPolicy_Proxy_Broker (void) { } -_TAO_CORBA_ConstructionPolicy_Proxy_Broker::~_TAO_CORBA_ConstructionPolicy_Proxy_Broker (void) +CORBA::_TAO_ConstructionPolicy_Proxy_Broker::~_TAO_ConstructionPolicy_Proxy_Broker (void) { } -_TAO_CORBA_ConstructionPolicy_Proxy_Broker * (*CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( +CORBA::_TAO_ConstructionPolicy_Proxy_Broker * (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; // Factory Member function Implementation. -_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker * -_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker (void) +CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker * +CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_ConstructionPolicy_Remote_Proxy_Broker (void) { - static ::_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker remote_proxy_broker; + static ::CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker remote_proxy_broker; return &remote_proxy_broker; } -_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker (void) +CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::_TAO_ConstructionPolicy_Remote_Proxy_Broker (void) { } -_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::~_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker (void) +CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::~_TAO_ConstructionPolicy_Remote_Proxy_Broker (void) { } -_TAO_CORBA_ConstructionPolicy_Proxy_Impl& -_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::select_proxy ( - ::CORBA_ConstructionPolicy * +CORBA::_TAO_ConstructionPolicy_Proxy_Impl& +CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::select_proxy ( + ::CORBA::ConstructionPolicy * ACE_ENV_ARG_DECL_NOT_USED ) { @@ -1391,81 +1381,83 @@ _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::select_proxy ( /////////////////////////////////////////////////////////////////////// -// default constructor -CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (int collocated) +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +CORBA::ConstructionPolicy::ConstructionPolicy (int collocated) { this->CORBA_ConstructionPolicy_setup_collocation (collocated); } -// destructor -CORBA_ConstructionPolicy::~CORBA_ConstructionPolicy (void) +CORBA::ConstructionPolicy::~ConstructionPolicy (void) {} void -CORBA_ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collocated) +CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collocated) { if (collocated) - this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_ = - ::CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this); + this->the_TAO_ConstructionPolicy_Proxy_Broker_ = + ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this); else - this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_ = - ::_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker (); + this->the_TAO_ConstructionPolicy_Proxy_Broker_ = + ::CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_ConstructionPolicy_Remote_Proxy_Broker (); this->CORBA_Policy_setup_collocation (collocated); } -void CORBA_ConstructionPolicy::_tao_any_destructor (void *x) +void CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer) { - CORBA_ConstructionPolicy *tmp = ACE_static_cast (CORBA_ConstructionPolicy*,x); + ConstructionPolicy *tmp = ACE_static_cast (ConstructionPolicy*, _tao_void_pointer); CORBA::release (tmp); } -CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_narrow ( +CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) - return CORBA_ConstructionPolicy::_nil (); + return ConstructionPolicy::_nil (); if (! obj->_is_local ()) { CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ConstructionPolicy::_nil ()); + ACE_CHECK_RETURN (ConstructionPolicy::_nil ()); if (is_a == 0) - return CORBA_ConstructionPolicy::_nil (); + return ConstructionPolicy::_nil (); } - return CORBA_ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow ( +CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) - return CORBA_ConstructionPolicy::_nil (); + return ConstructionPolicy::_nil (); if (! obj->_is_local ()) { TAO_Stub* stub = obj->_stubobj (); if (stub) stub->_incr_refcnt (); - - CORBA_ConstructionPolicy_ptr default_proxy = CORBA_ConstructionPolicy::_nil (); + ConstructionPolicy_ptr default_proxy = ConstructionPolicy::_nil (); if ( !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () &&CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer != 0 + obj->_is_collocated () && + CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer != 0 ) { ACE_NEW_RETURN ( default_proxy, - ::CORBA_ConstructionPolicy ( + ::CORBA::ConstructionPolicy ( stub, 1, obj->_servant () ), - CORBA_ConstructionPolicy::_nil () + ConstructionPolicy::_nil () ); } @@ -1473,42 +1465,42 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow ( { ACE_NEW_RETURN ( default_proxy, - ::CORBA_ConstructionPolicy ( + ::CORBA::ConstructionPolicy ( stub, 0, obj->_servant () ), - CORBA_ConstructionPolicy::_nil () + ConstructionPolicy::_nil () ); } return default_proxy; - } - else - return - ACE_reinterpret_cast - ( - CORBA_ConstructionPolicy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &CORBA_ConstructionPolicy::_tao_class_id - ) - ) - ); + } + else + return + ACE_reinterpret_cast + ( + ConstructionPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ConstructionPolicy::_tao_class_id + ) + ) + ); } -CORBA_ConstructionPolicy_ptr -CORBA_ConstructionPolicy::_duplicate (CORBA_ConstructionPolicy_ptr obj) +CORBA::ConstructionPolicy_ptr +CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) +CORBA::Boolean CORBA::ConstructionPolicy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) || @@ -1519,22 +1511,22 @@ CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value ACE_ENV return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } -void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_ConstructionPolicy::_narrow)) + &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_Policy::_tao_class_id)) + &::CORBA::Policy::_tao_class_id)) retv = ACE_reinterpret_cast ( void *, ACE_static_cast ( - CORBA_Policy_ptr, + CORBA::Policy_ptr, this ) ); @@ -1547,13 +1539,13 @@ void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type) return retv; } -const char* CORBA_ConstructionPolicy::_interface_repository_id (void) const +const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/ConstructionPolicy:1.0"; } -void CORBA_ConstructionPolicy::make_domain_manager ( - CORBA_InterfaceDef_ptr object_type, +void CORBA::ConstructionPolicy::make_domain_manager ( + CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy ACE_ENV_ARG_DECL ) @@ -1561,15 +1553,14 @@ void CORBA_ConstructionPolicy::make_domain_manager ( CORBA::SystemException )) { - _TAO_CORBA_ConstructionPolicy_Proxy_Impl &proxy = - this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); + _TAO_ConstructionPolicy_Proxy_Impl &proxy = + this->the_TAO_ConstructionPolicy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.make_domain_manager ( this, object_type, - constr_policy - ACE_ENV_ARG_PARAMETER + constr_policy ACE_ENV_ARG_PARAMETER ); } @@ -1601,11 +1592,13 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy ( sizeof (_oc_CORBA_ConstructionPolicy), (char *) &_oc_CORBA_ConstructionPolicy, 0, - sizeof (CORBA_ConstructionPolicy) + sizeof (CORBA::ConstructionPolicy) ); -CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy = - &_tc_TAO_tc_CORBA_ConstructionPolicy; +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (CORBA) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ConstructionPolicy, &_tc_TAO_tc_CORBA_ConstructionPolicy) +TAO_NAMESPACE_END #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -1613,88 +1606,88 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy = #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_ - // The Base_Sequence functions, please see tao/Sequence.h - void - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer (CORBA::ULong length) - { - CORBA_DomainManager **tmp = 0; - tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA_DomainManager **old = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_); - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - if (!this->release_) - { - tmp[i] = CORBA_DomainManager::_duplicate (old[i]); - } - else - { - tmp[i] = old[i]; - } - } - - if (this->release_) - { - delete[] old; - } - } - this->buffer_ = tmp; - } +// The Base_Sequence functions, please see tao/Sequence.h +void +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer (CORBA::ULong length) +{ + CORBA::DomainManager **tmp = 0; + tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length); - void - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void) + if (this->buffer_ != 0) { - if (this->buffer_ == 0 || this->release_ == 0) - return; - CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_); - + CORBA::DomainManager **old = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - CORBA::release (tmp[i]); - tmp[i] = CORBA_DomainManager::_nil (); + if (!this->release_) + { + tmp[i] = CORBA::DomainManager::_duplicate (old[i]); + } + else + { + tmp[i] = old[i]; + } } - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp); - this->buffer_ = 0; + if (this->release_) + { + delete[] old; + } } + this->buffer_ = tmp; +} - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void) - { - this->_deallocate_buffer (); - } +void +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_); - void - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) - { - CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_); + for (CORBA::ULong i = 0; i < this->length_; ++i) + { + CORBA::release (tmp[i]); + tmp[i] = CORBA::DomainManager::_nil (); + } - for (CORBA::ULong i = nl; i < ol; ++i) - { - CORBA::release (tmp[i]); - tmp[i] = CORBA_DomainManager::_nil (); - } - } + _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp); + this->buffer_ = 0; +} - void - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast ( - void* target, - CORBA_Object *src - ACE_ENV_ARG_DECL - ) - { - CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, target); - *tmp = CORBA_DomainManager::_narrow (src ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void) +{ + this->_deallocate_buffer (); +} - CORBA_Object* - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *src) const - { - CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, src); - return *tmp; - } +void +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) +{ + CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_); + + for (CORBA::ULong i = nl; i < ol; ++i) + { + CORBA::release (tmp[i]); + tmp[i] = CORBA::DomainManager::_nil (); + } +} + +void +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast ( + void* target, + CORBA_Object *src + ACE_ENV_ARG_DECL + ) +{ + CORBA::DomainManager **tmp = ACE_static_cast (CORBA::DomainManager**, target); + *tmp = CORBA::DomainManager::_narrow (src ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +CORBA_Object* +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *src) const +{ + CORBA::DomainManager **tmp = ACE_static_cast (CORBA::DomainManager**, src); + return *tmp; +} #endif /* end #if !defined */ @@ -1705,43 +1698,43 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy = #define _CORBA_DOMAINMANAGERLIST_CS_ // ************************************************************* -// CORBA_DomainManagerList +// CORBA::DomainManagerList // ************************************************************* -CORBA_DomainManagerList::CORBA_DomainManagerList (void) +CORBA::DomainManagerList::DomainManagerList (void) {} -CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max) // uses max size +CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max) // uses max size : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList +_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> +TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} -CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max, CORBA::ULong length, CORBA_DomainManager_ptr *buffer, CORBA::Boolean release) +CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max, CORBA::ULong length, CORBA::DomainManager_ptr *buffer, CORBA::Boolean release) : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList +_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> +TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} -CORBA_DomainManagerList::CORBA_DomainManagerList (const CORBA_DomainManagerList &seq) // copy ctor +CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq) // copy ctor : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList +_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> +TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} -CORBA_DomainManagerList::~CORBA_DomainManagerList (void) // dtor +CORBA::DomainManagerList::~DomainManagerList (void) // dtor {} -void CORBA_DomainManagerList::_tao_any_destructor (void *x) +void CORBA::DomainManagerList::_tao_any_destructor (void *_tao_void_pointer) { - CORBA_DomainManagerList *tmp = ACE_static_cast (CORBA_DomainManagerList*,x); + DomainManagerList *tmp = ACE_static_cast (DomainManagerList*, _tao_void_pointer); delete tmp; } @@ -1799,36 +1792,38 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList ( sizeof (_oc_CORBA_DomainManagerList), (char *) &_oc_CORBA_DomainManagerList, 0, - sizeof (CORBA_DomainManagerList) + sizeof (CORBA::DomainManagerList) ); -CORBA::TypeCode_ptr _tc_CORBA_DomainManagerList = - &_tc_TAO_tc_CORBA_DomainManagerList; +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (CORBA) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_DomainManagerList, &_tc_TAO_tc_CORBA_DomainManagerList) +TAO_NAMESPACE_END -void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManager_ptr _tao_elem) +void operator<<= (CORBA::Any &_tao_any, CORBA::DomainManager_ptr _tao_elem) { TAO_OutputCDR stream; if (stream << _tao_elem) { _tao_any._tao_replace ( - _tc_CORBA_DomainManager, + CORBA::_tc_DomainManager, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, - CORBA_DomainManager::_duplicate (_tao_elem), - CORBA_DomainManager::_tao_any_destructor + CORBA::DomainManager::_duplicate (_tao_elem), + CORBA::DomainManager::_tao_any_destructor ); } } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr &_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DomainManager_ptr &_tao_elem) { ACE_TRY_NEW_ENV { - _tao_elem = CORBA_DomainManager::_nil (); + _tao_elem = CORBA::DomainManager::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManager ACE_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_DomainManager ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1841,55 +1836,55 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr if (stream >> _tao_elem) { ((CORBA::Any *)&_tao_any)->_tao_replace ( - _tc_CORBA_DomainManager, + CORBA::_tc_DomainManager, 1, _tao_elem, - CORBA_DomainManager::_tao_any_destructor + CORBA::DomainManager::_tao_any_destructor ); return 1; } } ACE_CATCHANY { - _tao_elem = CORBA_DomainManager::_nil (); + _tao_elem = CORBA::DomainManager::_nil (); return 0; } ACE_ENDTRY; - _tao_elem = CORBA_DomainManager::_nil (); + _tao_elem = CORBA::DomainManager::_nil (); return 0; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>; + template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> + # pragma instantiate TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -void operator<<= (CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr _tao_elem) +void operator<<= (CORBA::Any &_tao_any, CORBA::ConstructionPolicy_ptr _tao_elem) { TAO_OutputCDR stream; if (stream << _tao_elem) { _tao_any._tao_replace ( - _tc_CORBA_ConstructionPolicy, + CORBA::_tc_ConstructionPolicy, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, - CORBA_ConstructionPolicy::_duplicate (_tao_elem), - CORBA_ConstructionPolicy::_tao_any_destructor + CORBA::ConstructionPolicy::_duplicate (_tao_elem), + CORBA::ConstructionPolicy::_tao_any_destructor ); } } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr &_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ConstructionPolicy_ptr &_tao_elem) { ACE_TRY_NEW_ENV { - _tao_elem = CORBA_ConstructionPolicy::_nil (); + _tao_elem = CORBA::ConstructionPolicy::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstructionPolicy ACE_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstructionPolicy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1902,77 +1897,77 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy if (stream >> _tao_elem) { ((CORBA::Any *)&_tao_any)->_tao_replace ( - _tc_CORBA_ConstructionPolicy, + CORBA::_tc_ConstructionPolicy, 1, _tao_elem, - CORBA_ConstructionPolicy::_tao_any_destructor + CORBA::ConstructionPolicy::_tao_any_destructor ); return 1; } } ACE_CATCHANY { - _tao_elem = CORBA_ConstructionPolicy::_nil (); + _tao_elem = CORBA::ConstructionPolicy::_nil (); return 0; } ACE_ENDTRY; - _tao_elem = CORBA_ConstructionPolicy::_nil (); + _tao_elem = CORBA::ConstructionPolicy::_nil (); return 0; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>; + template class TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var> + # pragma instantiate TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ void operator<<= ( CORBA::Any &_tao_any, - const CORBA_DomainManagerList &_tao_elem + const CORBA::DomainManagerList &_tao_elem ) // copying { TAO_OutputCDR stream; if (stream << _tao_elem) { _tao_any._tao_replace ( - _tc_CORBA_DomainManagerList, + CORBA::_tc_DomainManagerList, TAO_ENCAP_BYTE_ORDER, stream.begin () ); } } -void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManagerList *_tao_elem) // non copying +void operator<<= (CORBA::Any &_tao_any, CORBA::DomainManagerList *_tao_elem) // non copying { TAO_OutputCDR stream; stream << *_tao_elem; _tao_any._tao_replace ( - _tc_CORBA_DomainManagerList, + CORBA::_tc_DomainManagerList, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, _tao_elem, - CORBA_DomainManagerList::_tao_any_destructor + CORBA::DomainManagerList::_tao_any_destructor ); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManagerList *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DomainManagerList *&_tao_elem) { return _tao_any >>= ACE_const_cast( - const CORBA_DomainManagerList*&, + const CORBA::DomainManagerList*&, _tao_elem ); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManagerList *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::DomainManagerList *&_tao_elem) { _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManagerList ACE_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (CORBA::_tc_DomainManagerList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -1981,15 +1976,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( - const CORBA_DomainManagerList*, + const CORBA::DomainManagerList*, _tao_any.value () ); return 1; } else { - CORBA_DomainManagerList *tmp; - ACE_NEW_RETURN (tmp, CORBA_DomainManagerList, 0); + CORBA::DomainManagerList *tmp; + ACE_NEW_RETURN (tmp, CORBA::DomainManagerList, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -1997,10 +1992,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( - _tc_CORBA_DomainManagerList, + CORBA::_tc_DomainManagerList, 1, ACE_static_cast (void *, tmp), - CORBA_DomainManagerList::_tao_any_destructor + CORBA::DomainManagerList::_tao_any_destructor ); _tao_elem = tmp; return 1; @@ -2020,7 +2015,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const CORBA_DomainManager_ptr _tao_objref + const CORBA::DomainManager_ptr _tao_objref ) { CORBA::Object_ptr _tao_corba_obj = _tao_objref; @@ -2029,7 +2024,7 @@ CORBA::Boolean operator<< ( CORBA::Boolean operator>> ( TAO_InputCDR &strm, - CORBA_DomainManager_ptr &_tao_objref + CORBA::DomainManager_ptr &_tao_objref ) { ACE_TRY_NEW_ENV @@ -2039,9 +2034,9 @@ CORBA::Boolean operator>> ( return 0; // narrow to the right type _tao_objref = - CORBA_DomainManager::_unchecked_narrow ( + CORBA::DomainManager::_unchecked_narrow ( obj.in () - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -2056,7 +2051,7 @@ CORBA::Boolean operator>> ( CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const CORBA_ConstructionPolicy_ptr _tao_objref + const CORBA::ConstructionPolicy_ptr _tao_objref ) { CORBA::Object_ptr _tao_corba_obj = _tao_objref; @@ -2065,7 +2060,7 @@ CORBA::Boolean operator<< ( CORBA::Boolean operator>> ( TAO_InputCDR &strm, - CORBA_ConstructionPolicy_ptr &_tao_objref + CORBA::ConstructionPolicy_ptr &_tao_objref ) { ACE_TRY_NEW_ENV @@ -2075,9 +2070,9 @@ CORBA::Boolean operator>> ( return 0; // narrow to the right type _tao_objref = - CORBA_ConstructionPolicy::_unchecked_narrow ( + CORBA::ConstructionPolicy::_unchecked_narrow ( obj.in () - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -2092,7 +2087,7 @@ CORBA::Boolean operator>> ( CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const CORBA_DomainManagerList &_tao_sequence + const CORBA::DomainManagerList &_tao_sequence ) { if (strm << _tao_sequence.length ()) @@ -2110,7 +2105,7 @@ CORBA::Boolean operator<< ( CORBA::Boolean operator>> ( TAO_InputCDR &strm, - CORBA_DomainManagerList &_tao_sequence + CORBA::DomainManagerList &_tao_sequence ) { CORBA::ULong _tao_seq_len; diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 3638d9e5a59..4a5a7904a2b 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -19,18 +19,19 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_CORBA_DOMAINC_H_ -#define _TAO_IDL_CORBA_DOMAINC_H_ +#ifndef _TAO_IDL_ORIG_DOMAINC_H_ +#define _TAO_IDL_ORIG_DOMAINC_H_ #include "ace/pre.h" - -#include "tao/corbafwd.h" +#include "tao/corba.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "TAO_Export.h" #include "PolicyC.h" +#include "Sequence.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -55,794 +56,806 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ - +TAO_NAMESPACE CORBA +{ + #if !defined (_CORBA_DOMAINMANAGER___PTR_CH_) #define _CORBA_DOMAINMANAGER___PTR_CH_ - -class CORBA_DomainManager; -typedef CORBA_DomainManager *CORBA_DomainManager_ptr; - + + class DomainManager; + typedef DomainManager *DomainManager_ptr; + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DOMAINMANAGER___VAR_CH_) #define _CORBA_DOMAINMANAGER___VAR_CH_ - -class TAO_Export CORBA_DomainManager_var : public TAO_Base_var -{ -public: - CORBA_DomainManager_var (void); // default constructor - CORBA_DomainManager_var (CORBA_DomainManager_ptr p) : ptr_ (p) {} - CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor - ~CORBA_DomainManager_var (void); // destructor - - CORBA_DomainManager_var &operator= (CORBA_DomainManager_ptr); - CORBA_DomainManager_var &operator= (const CORBA_DomainManager_var &); - CORBA_DomainManager_ptr operator-> (void) const; - - operator const CORBA_DomainManager_ptr &() const; - operator CORBA_DomainManager_ptr &(); - // in, inout, out, _retn - CORBA_DomainManager_ptr in (void) const; - CORBA_DomainManager_ptr &inout (void); - CORBA_DomainManager_ptr &out (void); - CORBA_DomainManager_ptr _retn (void); - CORBA_DomainManager_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static CORBA_DomainManager_ptr tao_duplicate (CORBA_DomainManager_ptr); - static void tao_release (CORBA_DomainManager_ptr); - static CORBA_DomainManager_ptr tao_nil (void); - static CORBA_DomainManager_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED - ); - static CORBA::Object * tao_upcast (void *); - -private: - CORBA_DomainManager_ptr ptr_; - // Unimplemented - prevents widening assignment. - CORBA_DomainManager_var (const TAO_Base_var &rhs); - CORBA_DomainManager_var &operator= (const TAO_Base_var &rhs); -}; + + class TAO_Export DomainManager_var : public TAO_Base_var + { + public: + DomainManager_var (void); // default constructor + DomainManager_var (DomainManager_ptr p) : ptr_ (p) {} + DomainManager_var (const DomainManager_var &); // copy constructor + ~DomainManager_var (void); // destructor + + DomainManager_var &operator= (DomainManager_ptr); + DomainManager_var &operator= (const DomainManager_var &); + DomainManager_ptr operator-> (void) const; + + operator const DomainManager_ptr &() const; + operator DomainManager_ptr &(); + // in, inout, out, _retn + DomainManager_ptr in (void) const; + DomainManager_ptr &inout (void); + DomainManager_ptr &out (void); + DomainManager_ptr _retn (void); + DomainManager_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static DomainManager_ptr tao_duplicate (DomainManager_ptr); + static void tao_release (DomainManager_ptr); + static DomainManager_ptr tao_nil (void); + static DomainManager_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + DomainManager_ptr ptr_; + // Unimplemented - prevents widening assignment. + DomainManager_var (const TAO_Base_var &rhs); + DomainManager_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DOMAINMANAGER___OUT_CH_) #define _CORBA_DOMAINMANAGER___OUT_CH_ - - class TAO_Export CORBA_DomainManager_out + + class TAO_Export DomainManager_out { public: - CORBA_DomainManager_out (CORBA_DomainManager_ptr &); - CORBA_DomainManager_out (CORBA_DomainManager_var &); - CORBA_DomainManager_out (const CORBA_DomainManager_out &); - CORBA_DomainManager_out &operator= (const CORBA_DomainManager_out &); - CORBA_DomainManager_out &operator= (const CORBA_DomainManager_var &); - CORBA_DomainManager_out &operator= (CORBA_DomainManager_ptr); - operator CORBA_DomainManager_ptr &(); - CORBA_DomainManager_ptr &ptr (void); - CORBA_DomainManager_ptr operator-> (void); - + DomainManager_out (DomainManager_ptr &); + DomainManager_out (DomainManager_var &); + DomainManager_out (const DomainManager_out &); + DomainManager_out &operator= (const DomainManager_out &); + DomainManager_out &operator= (const DomainManager_var &); + DomainManager_out &operator= (DomainManager_ptr); + operator DomainManager_ptr &(); + DomainManager_ptr &ptr (void); + DomainManager_ptr operator-> (void); + private: - CORBA_DomainManager_ptr &ptr_; + DomainManager_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DOMAINMANAGER_CH_) #define _CORBA_DOMAINMANAGER_CH_ + + // Forward Classes Declaration. + class _TAO_DomainManager_Proxy_Impl; + class _TAO_DomainManager_Remote_Proxy_Impl; + class _TAO_DomainManager_Proxy_Broker; + class _TAO_DomainManager_Remote_Proxy_Broker; + + class TAO_Export DomainManager + : public virtual CORBA_Object + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef DomainManager_ptr _ptr_type; + typedef DomainManager_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + static int _tao_class_id; + + // The static operations. + static DomainManager_ptr _duplicate (DomainManager_ptr obj); + + static DomainManager_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static DomainManager_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static DomainManager_ptr _nil (void) + { + return (DomainManager_ptr)0; + } + + static void _tao_any_destructor (void*); + + virtual ::CORBA::Policy_ptr get_domain_policy ( + CORBA::PolicyType policy_type + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual CORBA::Boolean _is_a ( + const CORBA::Char *type_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; -// Forward Classes Declaration -class _TAO_CORBA_DomainManager_Proxy_Impl; -class _TAO_CORBA_DomainManager_Remote_Proxy_Impl; -class _TAO_CORBA_DomainManager_Proxy_Broker; -class _TAO_CORBA_DomainManager_Remote_Proxy_Broker; - -class TAO_Export CORBA_DomainManager : public virtual CORBA::Object -{ -public: -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_DomainManager_ptr _ptr_type; - typedef CORBA_DomainManager_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static int _tao_class_id; - - // The static operations. - static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj); - - static CORBA_DomainManager_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_DomainManager_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - - static CORBA_DomainManager_ptr _nil (void) - { - return (CORBA_DomainManager_ptr)0; - } - - static void _tao_any_destructor (void*); - - virtual CORBA::Policy_ptr get_domain_policy ( - CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - -private: - _TAO_CORBA_DomainManager_Proxy_Broker *the_TAO_CORBA_DomainManager_Proxy_Broker_; - -protected: - CORBA_DomainManager (int collocated = 0); - - // This methods travese the inheritance tree and set the - // parents piece of the given class in the right mode - virtual void CORBA_DomainManager_setup_collocation (int collocated); - - CORBA_DomainManager ( - TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0, - TAO_Abstract_ServantBase *servant = 0 - ); - - friend class _TAO_CORBA_DomainManager_Remote_Proxy_Impl; - friend class _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl; - friend class _TAO_CORBA_DomainManager_Direct_Proxy_Impl; - - virtual ~CORBA_DomainManager (void); -private: - CORBA_DomainManager (const CORBA_DomainManager &); - void operator= (const CORBA_DomainManager &); -}; - - -// The Proxy Implementations are used by each interface to -// perform a call. Each different implementation encapsulate -// an invocation logics. - - + private: + _TAO_DomainManager_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_; + + protected: + DomainManager (int collocated = 0); + + // These methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void CORBA_DomainManager_setup_collocation (int collocated); + + DomainManager ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); + + friend class _TAO_DomainManager_Remote_Proxy_Impl; + friend class _TAO_DomainManager_ThruPOA_Proxy_Impl; + friend class _TAO_DomainManager_Direct_Proxy_Impl; + + virtual ~DomainManager (void); + + private: + DomainManager (const DomainManager &); + void operator= (const DomainManager &); + }; + + // The Proxy Implementations are used by each interface to + // perform a call. Each different implementation encapsulate + // an invocation logics. + + /////////////////////////////////////////////////////////////////////// - // Base Impl. Declaration + // Base Proxy Impl. Declaration // - - class TAO_Export _TAO_CORBA_DomainManager_Proxy_Impl : public virtual TAO_Object_Proxy_Impl + + class TAO_Export _TAO_DomainManager_Proxy_Impl + : public virtual TAO_Object_Proxy_Impl { public: - virtual ~_TAO_CORBA_DomainManager_Proxy_Impl (void) { } - - virtual CORBA::Policy_ptr get_domain_policy ( - CORBA::Object_ptr _collocated_tao_target_, + virtual ~_TAO_DomainManager_Proxy_Impl (void) { } + virtual ::CORBA::Policy_ptr get_domain_policy ( + CORBA_Object *_collocated_tao_target_, CORBA::PolicyType policy_type ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - -protected: - _TAO_CORBA_DomainManager_Proxy_Impl (void); - + + + protected: + _TAO_DomainManager_Proxy_Impl (void); }; + // - // Base Proxy Impl. Declaration + // End Base Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////// -// Remote Impl. Declaration -// - -class TAO_Export _TAO_CORBA_DomainManager_Remote_Proxy_Impl : - public virtual _TAO_CORBA_DomainManager_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl -{ -public: - _TAO_CORBA_DomainManager_Remote_Proxy_Impl (void); - - virtual ~_TAO_CORBA_DomainManager_Remote_Proxy_Impl (void) { } - - virtual CORBA::Policy_ptr get_domain_policy ( - CORBA::Object_ptr _collocated_tao_target_, - CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -}; - -// -// Base Proxy Impl. Declaration -/////////////////////////////////////////////////////////////////////// - -// The Proxy Brokers are used by each interface to get -// the right proxy for performing a call. In the new -// collocation scheme, the proxy to be used can vary on -// a call by call basis. - - -/////////////////////////////////////////////////////////////////////// -// Base Proxy Broker Declaration -// - -class TAO_Export _TAO_CORBA_DomainManager_Proxy_Broker -{ -public: - virtual ~_TAO_CORBA_DomainManager_Proxy_Broker (void); - virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy ( - CORBA_DomainManager *object - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) = 0; - -protected: - _TAO_CORBA_DomainManager_Proxy_Broker (void); - -}; - -// -// End Base Proxy Broker Declaration -/////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////// -// Remote Proxy Broker Declaration -// - -class TAO_Export _TAO_CORBA_DomainManager_Remote_Proxy_Broker - : public virtual _TAO_CORBA_DomainManager_Proxy_Broker -{ -public: - _TAO_CORBA_DomainManager_Remote_Proxy_Broker (void); - - virtual ~_TAO_CORBA_DomainManager_Remote_Proxy_Broker (void); - - virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy ( - CORBA_DomainManager *object - ACE_ENV_ARG_DECL - ); - -private: - _TAO_CORBA_DomainManager_Remote_Proxy_Impl remote_proxy_impl_; - -public: -// This member function is used to get an handle to the unique instance -// of the Remote Proxy Broker that is available for a given -// interface. - static _TAO_CORBA_DomainManager_Remote_Proxy_Broker *the_TAO_CORBA_DomainManager_Remote_Proxy_Broker (void); -}; - -// -// End Remote Proxy Broker Declaration -/////////////////////////////////////////////////////////////////////// - - + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Impl. Declaration + // + + class TAO_Export _TAO_DomainManager_Remote_Proxy_Impl + : public virtual _TAO_DomainManager_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl + { + public: + _TAO_DomainManager_Remote_Proxy_Impl (void); + + virtual ~_TAO_DomainManager_Remote_Proxy_Impl (void) { } + virtual ::CORBA::Policy_ptr get_domain_policy ( + CORBA_Object *_collocated_tao_target_, + CORBA::PolicyType policy_type + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + + }; + + // + // End Remote Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + + // The Proxy Brokers are used by each interface to get + // the right proxy for performing a call. In the new + // collocation scheme, the proxy to be used can vary on + // a call by call basis. + + + /////////////////////////////////////////////////////////////////////// + // Base Proxy Broker Declaration + // + + class TAO_Export _TAO_DomainManager_Proxy_Broker + { + public: + virtual ~_TAO_DomainManager_Proxy_Broker (void); + virtual _TAO_DomainManager_Proxy_Impl &select_proxy ( + DomainManager *object + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) = 0; + + protected: + _TAO_DomainManager_Proxy_Broker (void); + + }; + + // + // End Base Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Broker Declaration + // + + class TAO_Export _TAO_DomainManager_Remote_Proxy_Broker + : public virtual _TAO_DomainManager_Proxy_Broker + { + public: + _TAO_DomainManager_Remote_Proxy_Broker (void); + + virtual ~_TAO_DomainManager_Remote_Proxy_Broker (void); + + virtual _TAO_DomainManager_Proxy_Impl &select_proxy ( + DomainManager *object + ACE_ENV_ARG_DECL + ); + + private: + _TAO_DomainManager_Remote_Proxy_Impl remote_proxy_impl_; + + public: + // This member function is used to get an handle to the unique instance + // of the Remote Proxy Broker that is available for a given + // interface. + static _TAO_DomainManager_Remote_Proxy_Broker *the_TAO_DomainManager_Remote_Proxy_Broker (void); + }; + + // + // End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + #endif /* end #if !defined */ - -extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_DomainManager; - - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManager; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SecConstruction; + + #if !defined (_CORBA_CONSTRUCTIONPOLICY___PTR_CH_) #define _CORBA_CONSTRUCTIONPOLICY___PTR_CH_ - -class CORBA_ConstructionPolicy; -typedef CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr; - + + class ConstructionPolicy; + typedef ConstructionPolicy *ConstructionPolicy_ptr; + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CH_) #define _CORBA_CONSTRUCTIONPOLICY___VAR_CH_ - -class TAO_Export CORBA_ConstructionPolicy_var : public TAO_Base_var -{ -public: - CORBA_ConstructionPolicy_var (void); // default constructor - CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr p) : ptr_ (p) {} - CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &); // copy constructor - ~CORBA_ConstructionPolicy_var (void); // destructor - - CORBA_ConstructionPolicy_var &operator= (CORBA_ConstructionPolicy_ptr); - CORBA_ConstructionPolicy_var &operator= (const CORBA_ConstructionPolicy_var &); - CORBA_ConstructionPolicy_ptr operator-> (void) const; - - operator const CORBA_ConstructionPolicy_ptr &() const; - operator CORBA_ConstructionPolicy_ptr &(); - // in, inout, out, _retn - CORBA_ConstructionPolicy_ptr in (void) const; - CORBA_ConstructionPolicy_ptr &inout (void); - CORBA_ConstructionPolicy_ptr &out (void); - CORBA_ConstructionPolicy_ptr _retn (void); - CORBA_ConstructionPolicy_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static CORBA_ConstructionPolicy_ptr tao_duplicate (CORBA_ConstructionPolicy_ptr); - static void tao_release (CORBA_ConstructionPolicy_ptr); - static CORBA_ConstructionPolicy_ptr tao_nil (void); - static CORBA_ConstructionPolicy_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED - ); - static CORBA::Object * tao_upcast (void *); - -private: - CORBA_ConstructionPolicy_ptr ptr_; - // Unimplemented - prevents widening assignment. - CORBA_ConstructionPolicy_var (const TAO_Base_var &rhs); - CORBA_ConstructionPolicy_var &operator= (const TAO_Base_var &rhs); -}; + + class TAO_Export ConstructionPolicy_var : public TAO_Base_var + { + public: + ConstructionPolicy_var (void); // default constructor + ConstructionPolicy_var (ConstructionPolicy_ptr p) : ptr_ (p) {} + ConstructionPolicy_var (const ConstructionPolicy_var &); // copy constructor + ~ConstructionPolicy_var (void); // destructor + + ConstructionPolicy_var &operator= (ConstructionPolicy_ptr); + ConstructionPolicy_var &operator= (const ConstructionPolicy_var &); + ConstructionPolicy_ptr operator-> (void) const; + + operator const ConstructionPolicy_ptr &() const; + operator ConstructionPolicy_ptr &(); + // in, inout, out, _retn + ConstructionPolicy_ptr in (void) const; + ConstructionPolicy_ptr &inout (void); + ConstructionPolicy_ptr &out (void); + ConstructionPolicy_ptr _retn (void); + ConstructionPolicy_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static ConstructionPolicy_ptr tao_duplicate (ConstructionPolicy_ptr); + static void tao_release (ConstructionPolicy_ptr); + static ConstructionPolicy_ptr tao_nil (void); + static ConstructionPolicy_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + ConstructionPolicy_ptr ptr_; + // Unimplemented - prevents widening assignment. + ConstructionPolicy_var (const TAO_Base_var &rhs); + ConstructionPolicy_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - + + #if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CH_) #define _CORBA_CONSTRUCTIONPOLICY___OUT_CH_ - -class TAO_Export CORBA_ConstructionPolicy_out -{ -public: - CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &); - CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_var &); - CORBA_ConstructionPolicy_out (const CORBA_ConstructionPolicy_out &); - CORBA_ConstructionPolicy_out &operator= (const CORBA_ConstructionPolicy_out &); - CORBA_ConstructionPolicy_out &operator= (const CORBA_ConstructionPolicy_var &); - CORBA_ConstructionPolicy_out &operator= (CORBA_ConstructionPolicy_ptr); - operator CORBA_ConstructionPolicy_ptr &(); - CORBA_ConstructionPolicy_ptr &ptr (void); - CORBA_ConstructionPolicy_ptr operator-> (void); - -private: - CORBA_ConstructionPolicy_ptr &ptr_; -}; - - + + class TAO_Export ConstructionPolicy_out + { + public: + ConstructionPolicy_out (ConstructionPolicy_ptr &); + ConstructionPolicy_out (ConstructionPolicy_var &); + ConstructionPolicy_out (const ConstructionPolicy_out &); + ConstructionPolicy_out &operator= (const ConstructionPolicy_out &); + ConstructionPolicy_out &operator= (const ConstructionPolicy_var &); + ConstructionPolicy_out &operator= (ConstructionPolicy_ptr); + operator ConstructionPolicy_ptr &(); + ConstructionPolicy_ptr &ptr (void); + ConstructionPolicy_ptr operator-> (void); + + private: + ConstructionPolicy_ptr &ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_) #define _CORBA_CONSTRUCTIONPOLICY_CH_ + + // Forward Classes Declaration. + class _TAO_ConstructionPolicy_Proxy_Impl; + class _TAO_ConstructionPolicy_Remote_Proxy_Impl; + class _TAO_ConstructionPolicy_Proxy_Broker; + class _TAO_ConstructionPolicy_Remote_Proxy_Broker; + + class TAO_Export ConstructionPolicy + : public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef ConstructionPolicy_ptr _ptr_type; + typedef ConstructionPolicy_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + static int _tao_class_id; + + // The static operations. + static ConstructionPolicy_ptr _duplicate (ConstructionPolicy_ptr obj); + + static ConstructionPolicy_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static ConstructionPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static ConstructionPolicy_ptr _nil (void) + { + return (ConstructionPolicy_ptr)0; + } + + static void _tao_any_destructor (void*); + + virtual void make_domain_manager ( + CORBA::InterfaceDef_ptr object_type, + CORBA::Boolean constr_policy + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual CORBA::Boolean _is_a ( + const CORBA::Char *type_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; -// Forward Classes Declaration -class _TAO_CORBA_ConstructionPolicy_Proxy_Impl; -class _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl; -class _TAO_CORBA_ConstructionPolicy_Proxy_Broker; -class _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker; - -class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA_Policy -{ -public: -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_ConstructionPolicy_ptr _ptr_type; - typedef CORBA_ConstructionPolicy_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static int _tao_class_id; - - // The static operations. - static CORBA_ConstructionPolicy_ptr _duplicate (CORBA_ConstructionPolicy_ptr obj); - - static CORBA_ConstructionPolicy_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - - static CORBA_ConstructionPolicy_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - - static CORBA_ConstructionPolicy_ptr _nil (void) - { - return (CORBA_ConstructionPolicy_ptr)0; - } - - static void _tao_any_destructor (void*); - - virtual void make_domain_manager ( - CORBA_InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - -private: - _TAO_CORBA_ConstructionPolicy_Proxy_Broker *the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_; - -protected: - CORBA_ConstructionPolicy (int collocated = 0); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode - virtual void CORBA_ConstructionPolicy_setup_collocation (int collocated); - - CORBA_ConstructionPolicy ( - TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0, - TAO_Abstract_ServantBase *servant = 0 - ); - - friend class _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl; - friend class _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl; - friend class _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl; - - virtual ~CORBA_ConstructionPolicy (void); -private: - CORBA_ConstructionPolicy (const CORBA_ConstructionPolicy &); - void operator= (const CORBA_ConstructionPolicy &); -}; - - -// The Proxy Implementations are used by each interface to -// perform a call. Each different implementation encapsulate -// an invocation logics. - - -/////////////////////////////////////////////////////////////////////// -// Base Proxy Impl. Declaration -// - -class TAO_Export _TAO_CORBA_ConstructionPolicy_Proxy_Impl - : public virtual CORBA_TAO_Policy_Proxy_Impl -{ -public: - virtual ~_TAO_CORBA_ConstructionPolicy_Proxy_Impl (void) { } - virtual void make_domain_manager ( - CORBA::Object_ptr _collocated_tao_target_, - CORBA_InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - -protected: - _TAO_CORBA_ConstructionPolicy_Proxy_Impl (void); -}; - -// -// End Base Proxy Impl. Declaration -/////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////// -// Remote Impl. Declaration -// - -class TAO_Export _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl : - public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl, - public virtual CORBA_TAO_Policy_Remote_Proxy_Impl -{ -public: - _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl (void); - - virtual ~_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl (void) { } - virtual void make_domain_manager ( - CORBA::Object_ptr _collocated_tao_target_, - CORBA_InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - -}; - -// -// Base Proxy Impl. Declaration -/////////////////////////////////////////////////////////////////////// - -// The Proxy Brokers are used by each interface to get -// the right proxy for performing a call. In the new -// collocation scheme, the proxy to be used can vary on -// a call by call basis. - - -/////////////////////////////////////////////////////////////////////// -// Base Proxy Broker Declaration -// - -class TAO_Export _TAO_CORBA_ConstructionPolicy_Proxy_Broker -{ -public: - virtual ~_TAO_CORBA_ConstructionPolicy_Proxy_Broker (void); - virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy ( - CORBA_ConstructionPolicy *object - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) = 0; - -protected: - _TAO_CORBA_ConstructionPolicy_Proxy_Broker (void); - -}; - -// -// End Base Proxy Broker Declaration -/////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////// -// Remote Proxy Broker Declaration -// - -class TAO_Export _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker : public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Broker -{ -public: - _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker (void); - - virtual ~_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker (void); - - virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy ( - CORBA_ConstructionPolicy *object - ACE_ENV_ARG_DECL - ); - -private: - _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl remote_proxy_impl_; - -public: - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. - static _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker *the_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker (void); -}; - - -// -// End Remote Proxy Broker Declaration -/////////////////////////////////////////////////////////////////////// - - + private: + _TAO_ConstructionPolicy_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_; + + protected: + ConstructionPolicy (int collocated = 0); + + // These methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void CORBA_ConstructionPolicy_setup_collocation (int collocated); + + ConstructionPolicy ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); + + friend class _TAO_ConstructionPolicy_Remote_Proxy_Impl; + friend class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl; + friend class _TAO_ConstructionPolicy_Direct_Proxy_Impl; + + virtual ~ConstructionPolicy (void); + + private: + ConstructionPolicy (const ConstructionPolicy &); + void operator= (const ConstructionPolicy &); + }; + + // The Proxy Implementations are used by each interface to + // perform a call. Each different implementation encapsulate + // an invocation logics. + + + /////////////////////////////////////////////////////////////////////// + // Base Proxy Impl. Declaration + // + + class TAO_Export _TAO_ConstructionPolicy_Proxy_Impl + : public virtual CORBA::_TAO_Policy_Proxy_Impl + { + public: + virtual ~_TAO_ConstructionPolicy_Proxy_Impl (void) { } + virtual void make_domain_manager ( + CORBA_Object *_collocated_tao_target_, + CORBA::InterfaceDef_ptr object_type, + CORBA::Boolean constr_policy + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + + protected: + _TAO_ConstructionPolicy_Proxy_Impl (void); + }; + + // + // End Base Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Impl. Declaration + // + + class TAO_Export _TAO_ConstructionPolicy_Remote_Proxy_Impl + : public virtual _TAO_ConstructionPolicy_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl, + public virtual CORBA::_TAO_Policy_Remote_Proxy_Impl + { + public: + _TAO_ConstructionPolicy_Remote_Proxy_Impl (void); + + virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) { } + virtual void make_domain_manager ( + CORBA_Object *_collocated_tao_target_, + CORBA::InterfaceDef_ptr object_type, + CORBA::Boolean constr_policy + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + + }; + + // + // End Remote Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + + // The Proxy Brokers are used by each interface to get + // the right proxy for performing a call. In the new + // collocation scheme, the proxy to be used can vary on + // a call by call basis. + + + /////////////////////////////////////////////////////////////////////// + // Base Proxy Broker Declaration + // + + class TAO_Export _TAO_ConstructionPolicy_Proxy_Broker + { + public: + virtual ~_TAO_ConstructionPolicy_Proxy_Broker (void); + virtual _TAO_ConstructionPolicy_Proxy_Impl &select_proxy ( + ConstructionPolicy *object + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) = 0; + + protected: + _TAO_ConstructionPolicy_Proxy_Broker (void); + + }; + + // + // End Base Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Broker Declaration + // + + class TAO_Export _TAO_ConstructionPolicy_Remote_Proxy_Broker + : public virtual _TAO_ConstructionPolicy_Proxy_Broker + { + public: + _TAO_ConstructionPolicy_Remote_Proxy_Broker (void); + + virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Broker (void); + + virtual _TAO_ConstructionPolicy_Proxy_Impl &select_proxy ( + ConstructionPolicy *object + ACE_ENV_ARG_DECL + ); + + private: + _TAO_ConstructionPolicy_Remote_Proxy_Impl remote_proxy_impl_; + + public: + // This member function is used to get an handle to the unique instance + // of the Remote Proxy Broker that is available for a given + // interface. + static _TAO_ConstructionPolicy_Remote_Proxy_Broker *the_TAO_ConstructionPolicy_Remote_Proxy_Broker (void); + }; + + // + // End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + #endif /* end #if !defined */ - -extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy; - - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstructionPolicy; + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_ - -class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList - : public TAO_Unbounded_Base_Sequence -{ -public: - // = Initialization and termination methods. - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void); - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum); - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList ( - CORBA::ULong maximum, - CORBA::ULong length, - CORBA_DomainManager* *value, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList ( - const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs - ); - _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &operator= ( - const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs - ); - virtual ~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void); - - // = Accessors. - TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong index) const; - - // = Static operations. - static CORBA_DomainManager **allocbuf (CORBA::ULong nelems); - static void freebuf (CORBA_DomainManager **buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - CORBA_DomainManager* *get_buffer (CORBA::Boolean orphan = 0); - const CORBA_DomainManager* *get_buffer (void) const; - virtual void _shrink_buffer ( - CORBA::ULong nl, - CORBA::ULong ol - ); - - virtual void _downcast ( - void* target, - CORBA_Object *src - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - virtual CORBA_Object* _upcast (void *src) const; -}; - + + class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void); + _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum); + _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList ( + CORBA::ULong maximum, + CORBA::ULong length, + DomainManager* *value, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList ( + const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs + ); + _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &operator= ( + const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs + ); + virtual ~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void); + + // = Accessors. + TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> operator[] (CORBA::ULong index) const; + + // = Static operations. + static DomainManager **allocbuf (CORBA::ULong nelems); + static void freebuf (DomainManager **buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + DomainManager* *get_buffer (CORBA::Boolean orphan = 0); + const DomainManager* *get_buffer (void) const; + virtual void _shrink_buffer ( + CORBA::ULong nl, + CORBA::ULong ol + ); + + virtual void _downcast ( + void* target, + CORBA_Object *src + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual CORBA_Object* _upcast (void *src) const; + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_CORBA_DOMAINMANAGERLIST_CH_) #define _CORBA_DOMAINMANAGERLIST_CH_ - -class CORBA_DomainManagerList; -class CORBA_DomainManagerList_var; - -// ************************************************************* -// CORBA_DomainManagerList -// ************************************************************* - -class TAO_Export CORBA_DomainManagerList : public + + class DomainManagerList; + class DomainManagerList_var; + + // ************************************************************* + // DomainManagerList + // ************************************************************* + + class TAO_Export DomainManagerList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -{ -public: - CORBA_DomainManagerList (void); // default ctor - CORBA_DomainManagerList (CORBA::ULong max); // uses max size - CORBA_DomainManagerList ( - CORBA::ULong max, - CORBA::ULong length, - CORBA_DomainManager_ptr *buffer, - CORBA::Boolean release = 0 - ); - CORBA_DomainManagerList (const CORBA_DomainManagerList &); // copy ctor - ~CORBA_DomainManagerList (void); - static void _tao_any_destructor (void*); - + TAO_Unbounded_Object_Sequence<DomainManager,DomainManager_var> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + DomainManagerList (void); // default ctor + DomainManagerList (CORBA::ULong max); // uses max size + DomainManagerList ( + CORBA::ULong max, + CORBA::ULong length, + DomainManager_ptr *buffer, + CORBA::Boolean release = 0 + ); + DomainManagerList (const DomainManagerList &); // copy ctor + ~DomainManagerList (void); + static void _tao_any_destructor (void*); + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_DomainManagerList_var _var_type; + typedef DomainManagerList_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - - -}; - + + + }; + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DOMAINMANAGERLIST___VAR_CH_) #define _CORBA_DOMAINMANAGERLIST___VAR_CH_ - -// ************************************************************* -// class CORBA_DomainManagerList_var -// ************************************************************* - -class TAO_Export CORBA_DomainManagerList_var -{ -public: - CORBA_DomainManagerList_var (void); // default constructor - CORBA_DomainManagerList_var (CORBA_DomainManagerList *); - CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &); // copy constructor - ~CORBA_DomainManagerList_var (void); // destructor - - CORBA_DomainManagerList_var &operator= (CORBA_DomainManagerList *); - CORBA_DomainManagerList_var &operator= (const CORBA_DomainManagerList_var &); - CORBA_DomainManagerList *operator-> (void); - const CORBA_DomainManagerList *operator-> (void) const; - - operator const CORBA_DomainManagerList &() const; - operator CORBA_DomainManagerList &(); - operator CORBA_DomainManagerList &() const; - operator CORBA_DomainManagerList *&(); // variable-size base types only - - TAO_Object_Manager<CORBA_DomainManager, CORBA_DomainManager_var> operator[] (CORBA::ULong index); - - // in, inout, out, _retn - const CORBA_DomainManagerList &in (void) const; - CORBA_DomainManagerList &inout (void); - CORBA_DomainManagerList *&out (void); - CORBA_DomainManagerList *_retn (void); - CORBA_DomainManagerList *ptr (void) const; - -private: - CORBA_DomainManagerList *ptr_; -}; - - + + // ************************************************************* + // class CORBA::DomainManagerList_var + // ************************************************************* + + class TAO_Export DomainManagerList_var + { + public: + DomainManagerList_var (void); + DomainManagerList_var (DomainManagerList *); + DomainManagerList_var (const DomainManagerList_var &); + ~DomainManagerList_var (void); + + DomainManagerList_var &operator= (DomainManagerList *); + DomainManagerList_var &operator= (const DomainManagerList_var &); + DomainManagerList *operator-> (void); + const DomainManagerList *operator-> (void) const; + + operator const DomainManagerList &() const; + operator DomainManagerList &(); + operator DomainManagerList &() const; + operator DomainManagerList *&(); // variable-size base types only + + TAO_Object_Manager<DomainManager, DomainManager_var> operator[] (CORBA::ULong index); + + // in, inout, out, _retn + const DomainManagerList &in (void) const; + DomainManagerList &inout (void); + DomainManagerList *&out (void); + DomainManagerList *_retn (void); + DomainManagerList *ptr (void) const; + + private: + DomainManagerList *ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DOMAINMANAGERLIST___OUT_CH_) #define _CORBA_DOMAINMANAGERLIST___OUT_CH_ - -class TAO_Export CORBA_DomainManagerList_out -{ -public: - CORBA_DomainManagerList_out (CORBA_DomainManagerList *&); - CORBA_DomainManagerList_out (CORBA_DomainManagerList_var &); - CORBA_DomainManagerList_out (const CORBA_DomainManagerList_out &); - CORBA_DomainManagerList_out &operator= (const CORBA_DomainManagerList_out &); - CORBA_DomainManagerList_out &operator= (CORBA_DomainManagerList *); - operator CORBA_DomainManagerList *&(); - CORBA_DomainManagerList *&ptr (void); - CORBA_DomainManagerList *operator-> (void); - TAO_Object_Manager<CORBA_DomainManager, CORBA_DomainManager_var> operator[] (CORBA::ULong index); - -private: - CORBA_DomainManagerList *&ptr_; - // assignment from T_var not allowed - void operator= (const CORBA_DomainManagerList_var &); -}; - - + + class TAO_Export DomainManagerList_out + { + public: + DomainManagerList_out (DomainManagerList *&); + DomainManagerList_out (DomainManagerList_var &); + DomainManagerList_out (const DomainManagerList_out &); + DomainManagerList_out &operator= (const DomainManagerList_out &); + DomainManagerList_out &operator= (DomainManagerList *); + operator DomainManagerList *&(); + DomainManagerList *&ptr (void); + DomainManagerList *operator-> (void); + TAO_Object_Manager<DomainManager, DomainManager_var> operator[] (CORBA::ULong index); + + private: + DomainManagerList *&ptr_; + // Assignment from T_var not allowed. + void operator= (const DomainManagerList_var &); + }; + + #endif /* end #if !defined */ - -extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_DomainManagerList; + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManagerList; + + +} +TAO_NAMESPACE_CLOSE // module CORBA // Proxy Broker Factory function pointer declarations. extern TAO_Export -_TAO_CORBA_DomainManager_Proxy_Broker * -(*CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) ( +CORBA::_TAO_DomainManager_Proxy_Broker * +(*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ); extern TAO_Export -_TAO_CORBA_ConstructionPolicy_Proxy_Broker * -(*CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( +CORBA::_TAO_ConstructionPolicy_Proxy_Broker * +(*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ); -// Any operators for interface CORBA_DomainManager -TAO_Export void operator<<= (CORBA::Any &, CORBA_DomainManager_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManager *&); -// Any operators for interface CORBA_ConstructionPolicy -TAO_Export void operator<<= (CORBA::Any &, CORBA_ConstructionPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstructionPolicy *&); -TAO_Export void operator<<= (CORBA::Any &, const CORBA_DomainManagerList &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CORBA_DomainManagerList*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManagerList *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_DomainManagerList *&); +// Any operators for interface CORBA::DomainManager +TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr); +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManager *&); +// Any operators for interface CORBA::ConstructionPolicy +TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr); +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstructionPolicy *&); +TAO_Export void operator<<= (CORBA::Any &, const CORBA::DomainManagerList &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManagerList*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManagerList *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DomainManagerList *&); #ifndef __ACE_INLINE__ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_DomainManager_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_DomainManager_ptr &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstructionPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstructionPolicy_ptr &); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DomainManager_ptr ); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DomainManager_ptr &); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstructionPolicy_ptr ); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstructionPolicy_ptr &); #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_H_ #define _TAO_CDR_OP_CORBA_DomainManagerList_H_ TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const CORBA_DomainManagerList & + const CORBA::DomainManagerList & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - CORBA_DomainManagerList & + CORBA::DomainManagerList & ); #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */ diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i index 12dadea9fcb..1bd874d2b4d 100644 --- a/TAO/tao/DomainC.i +++ b/TAO/tao/DomainC.i @@ -24,7 +24,7 @@ #define _CORBA_DOMAINMANAGER___CI_ ACE_INLINE -CORBA_DomainManager::CORBA_DomainManager ( +CORBA::DomainManager::DomainManager ( TAO_Stub *objref, CORBA::Boolean _tao_collocated, TAO_Abstract_ServantBase *servant @@ -42,7 +42,7 @@ CORBA_DomainManager::CORBA_DomainManager ( #define _CORBA_CONSTRUCTIONPOLICY___CI_ ACE_INLINE -CORBA_ConstructionPolicy::CORBA_ConstructionPolicy ( +CORBA::ConstructionPolicy::ConstructionPolicy ( TAO_Stub *objref, CORBA::Boolean _tao_collocated, TAO_Abstract_ServantBase *servant @@ -61,23 +61,23 @@ CORBA_ConstructionPolicy::CORBA_ConstructionPolicy ( #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_ -ACE_INLINE CORBA_DomainManager ** -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::ULong nelems) +ACE_INLINE CORBA::DomainManager ** +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::ULong nelems) { - CORBA_DomainManager **buf = 0; + CORBA::DomainManager **buf = 0; - ACE_NEW_RETURN (buf, CORBA_DomainManager*[nelems], 0); + ACE_NEW_RETURN (buf, CORBA::DomainManager*[nelems], 0); for (CORBA::ULong i = 0; i < nelems; i++) { - buf[i] = CORBA_DomainManager::_nil (); + buf[i] = CORBA::DomainManager::_nil (); } return buf; } ACE_INLINE void -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (CORBA_DomainManager **buffer) +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (CORBA::DomainManager **buffer) { if (buffer == 0) return; @@ -85,37 +85,37 @@ _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (CORBA_DomainMan } ACE_INLINE -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void) +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void) { } ACE_INLINE -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum) +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum) : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (maximum)) { } ACE_INLINE -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum, +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum, CORBA::ULong length, - CORBA_DomainManager* *value, + CORBA::DomainManager* *value, CORBA::Boolean release) : TAO_Unbounded_Base_Sequence (maximum, length, value, release) { } ACE_INLINE -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList(const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs) +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList(const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs) : TAO_Unbounded_Base_Sequence (rhs) { if (rhs.buffer_ != 0) { - CORBA_DomainManager **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_); - CORBA_DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA_DomainManager ** ACE_CAST_CONST, rhs.buffer_); + CORBA::DomainManager **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_); + CORBA::DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - tmp1[i] = CORBA_DomainManager::_duplicate (tmp2[i]); + tmp1[i] = CORBA::DomainManager::_duplicate (tmp2[i]); } this->buffer_ = tmp1; @@ -126,20 +126,20 @@ _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Se } } -ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList & -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs) +ACE_INLINE CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList & +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs) { if (this == &rhs) return *this; if (this->release_) { - CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager **, this->buffer_); + CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { CORBA::release (tmp[i]); - tmp[i] = CORBA_DomainManager::_nil (); + tmp[i] = CORBA::DomainManager::_nil (); } if (this->maximum_ < rhs.maximum_) { @@ -152,30 +152,30 @@ _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (const _TAO_Un TAO_Unbounded_Base_Sequence::operator= (rhs); - CORBA_DomainManager **tmp1 = ACE_reinterpret_cast (CORBA_DomainManager **, this->buffer_); - CORBA_DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA_DomainManager ** ACE_CAST_CONST, rhs.buffer_); + CORBA::DomainManager **tmp1 = ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_); + CORBA::DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - tmp1[i] = CORBA_DomainManager::_duplicate (tmp2[i]); + tmp1[i] = CORBA::DomainManager::_duplicate (tmp2[i]); } return *this; } -ACE_INLINE TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator[] (CORBA::ULong index) const +ACE_INLINE TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator[] (CORBA::ULong index) const // read-write accessor { ACE_ASSERT (index < this->maximum_); - CORBA_DomainManager ** const tmp = ACE_reinterpret_cast (CORBA_DomainManager ** ACE_CAST_CONST, this->buffer_); - return TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> (tmp + index, this->release_); + CORBA::DomainManager ** const tmp = ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_); + return TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> (tmp + index, this->release_); } -ACE_INLINE CORBA_DomainManager* * -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boolean orphan) +ACE_INLINE CORBA::DomainManager* * +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boolean orphan) { - CORBA_DomainManager **result = 0; + CORBA::DomainManager **result = 0; if (orphan == 0) { // We retain ownership. @@ -187,7 +187,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boole } else { - result = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_); + result = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_); } } else // if (orphan == 1) @@ -196,7 +196,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boole { // We set the state back to default and relinquish // ownership. - result = ACE_reinterpret_cast(CORBA_DomainManager**,this->buffer_); + result = ACE_reinterpret_cast(CORBA::DomainManager**,this->buffer_); this->maximum_ = 0; this->length_ = 0; this->buffer_ = 0; @@ -206,10 +206,10 @@ _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boole return result; } -ACE_INLINE const CORBA_DomainManager* * -_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (void) const +ACE_INLINE const CORBA::DomainManager* * +CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (void) const { - return ACE_reinterpret_cast(const CORBA_DomainManager ** ACE_CAST_CONST, this->buffer_); + return ACE_reinterpret_cast(const CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_); } @@ -222,44 +222,44 @@ _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (void) const #define _CORBA_DOMAINMANAGERLIST_CI_ // ************************************************************* -// Inline operations for class CORBA_DomainManagerList_var +// Inline operations for class CORBA::DomainManagerList_var // ************************************************************* ACE_INLINE -CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (void) // default constructor +CORBA::DomainManagerList_var::DomainManagerList_var (void) // default constructor : ptr_ (0) {} ACE_INLINE -CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (CORBA_DomainManagerList *p) +CORBA::DomainManagerList_var::DomainManagerList_var (DomainManagerList *p) : ptr_ (p) {} ACE_INLINE -CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (const ::CORBA_DomainManagerList_var &p) // copy constructor +CORBA::DomainManagerList_var::DomainManagerList_var (const ::CORBA::DomainManagerList_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, ::CORBA_DomainManagerList (*p.ptr_)); + ACE_NEW (this->ptr_, ::CORBA::DomainManagerList (*p.ptr_)); else this->ptr_ = 0; } ACE_INLINE -CORBA_DomainManagerList_var::~CORBA_DomainManagerList_var (void) // destructor +CORBA::DomainManagerList_var::~DomainManagerList_var (void) // destructor { delete this->ptr_; } -ACE_INLINE CORBA_DomainManagerList_var & -CORBA_DomainManagerList_var::operator= (CORBA_DomainManagerList *p) +ACE_INLINE CORBA::DomainManagerList_var & +CORBA::DomainManagerList_var::operator= (DomainManagerList *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE ::CORBA_DomainManagerList_var & -CORBA_DomainManagerList_var::operator= (const ::CORBA_DomainManagerList_var &p) +ACE_INLINE ::CORBA::DomainManagerList_var & +CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p) { if (this != &p) { @@ -270,12 +270,12 @@ CORBA_DomainManagerList_var::operator= (const ::CORBA_DomainManagerList_var &p) } else { - CORBA_DomainManagerList *deep_copy = - new CORBA_DomainManagerList (*p.ptr_); + DomainManagerList *deep_copy = + new DomainManagerList (*p.ptr_); if (deep_copy != 0) { - CORBA_DomainManagerList *tmp = deep_copy; + DomainManagerList *tmp = deep_copy; deep_copy = this->ptr_; this->ptr_ = tmp; delete deep_copy; @@ -286,97 +286,97 @@ CORBA_DomainManagerList_var::operator= (const ::CORBA_DomainManagerList_var &p) return *this; } -ACE_INLINE const ::CORBA_DomainManagerList * -CORBA_DomainManagerList_var::operator-> (void) const +ACE_INLINE const ::CORBA::DomainManagerList * +CORBA::DomainManagerList_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE ::CORBA_DomainManagerList * -CORBA_DomainManagerList_var::operator-> (void) +ACE_INLINE ::CORBA::DomainManagerList * +CORBA::DomainManagerList_var::operator-> (void) { return this->ptr_; } ACE_INLINE -CORBA_DomainManagerList_var::operator const ::CORBA_DomainManagerList &() const // cast +CORBA::DomainManagerList_var::operator const ::CORBA::DomainManagerList &() const // cast { return *this->ptr_; } ACE_INLINE -CORBA_DomainManagerList_var::operator ::CORBA_DomainManagerList &() // cast +CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() // cast { return *this->ptr_; } ACE_INLINE -CORBA_DomainManagerList_var::operator ::CORBA_DomainManagerList &() const // cast +CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -CORBA_DomainManagerList_var::operator ::CORBA_DomainManagerList *&() // cast +CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList *&() // cast { return this->ptr_; } -ACE_INLINE TAO_Object_Manager<CORBA_DomainManager, CORBA_DomainManager_var> -CORBA_DomainManagerList_var::operator[] (CORBA::ULong index) +ACE_INLINE TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var> +CORBA::DomainManagerList_var::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } -ACE_INLINE const ::CORBA_DomainManagerList & -CORBA_DomainManagerList_var::in (void) const +ACE_INLINE const ::CORBA::DomainManagerList & +CORBA::DomainManagerList_var::in (void) const { return *this->ptr_; } -ACE_INLINE ::CORBA_DomainManagerList & -CORBA_DomainManagerList_var::inout (void) +ACE_INLINE ::CORBA::DomainManagerList & +CORBA::DomainManagerList_var::inout (void) { return *this->ptr_; } // mapping for variable size -ACE_INLINE ::CORBA_DomainManagerList *& -CORBA_DomainManagerList_var::out (void) +ACE_INLINE ::CORBA::DomainManagerList *& +CORBA::DomainManagerList_var::out (void) { delete this->ptr_; this->ptr_ = 0; return this->ptr_; } -ACE_INLINE ::CORBA_DomainManagerList * -CORBA_DomainManagerList_var::_retn (void) +ACE_INLINE ::CORBA::DomainManagerList * +CORBA::DomainManagerList_var::_retn (void) { - ::CORBA_DomainManagerList *tmp = this->ptr_; + ::CORBA::DomainManagerList *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE ::CORBA_DomainManagerList * -CORBA_DomainManagerList_var::ptr (void) const +ACE_INLINE ::CORBA::DomainManagerList * +CORBA::DomainManagerList_var::ptr (void) const { return this->ptr_; } // ************************************************************* -// Inline operations for class CORBA_DomainManagerList_out +// Inline operations for class CORBA::DomainManagerList_out // ************************************************************* ACE_INLINE -CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (CORBA_DomainManagerList *&p) +CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (CORBA_DomainManagerList_var &p) // constructor from _var +CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -384,44 +384,44 @@ CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (CORBA_DomainManagerLis } ACE_INLINE -CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (const ::CORBA_DomainManagerList_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_DomainManagerList_out&, p).ptr_) +CORBA::DomainManagerList_out::DomainManagerList_out (const ::CORBA::DomainManagerList_out &p) // copy constructor + : ptr_ (ACE_const_cast (DomainManagerList_out&, p).ptr_) {} -ACE_INLINE ::CORBA_DomainManagerList_out & -CORBA_DomainManagerList_out::operator= (const ::CORBA_DomainManagerList_out &p) +ACE_INLINE ::CORBA::DomainManagerList_out & +CORBA::DomainManagerList_out::operator= (const ::CORBA::DomainManagerList_out &p) { - this->ptr_ = ACE_const_cast (CORBA_DomainManagerList_out&, p).ptr_; + this->ptr_ = ACE_const_cast (DomainManagerList_out&, p).ptr_; return *this; } -ACE_INLINE ::CORBA_DomainManagerList_out & -CORBA_DomainManagerList_out::operator= (CORBA_DomainManagerList *p) +ACE_INLINE ::CORBA::DomainManagerList_out & +CORBA::DomainManagerList_out::operator= (DomainManagerList *p) { this->ptr_ = p; return *this; } ACE_INLINE -CORBA_DomainManagerList_out::operator ::CORBA_DomainManagerList *&() // cast +CORBA::DomainManagerList_out::operator ::CORBA::DomainManagerList *&() // cast { return this->ptr_; } -ACE_INLINE ::CORBA_DomainManagerList *& -CORBA_DomainManagerList_out::ptr (void) // ptr +ACE_INLINE ::CORBA::DomainManagerList *& +CORBA::DomainManagerList_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE ::CORBA_DomainManagerList * -CORBA_DomainManagerList_out::operator-> (void) +ACE_INLINE ::CORBA::DomainManagerList * +CORBA::DomainManagerList_out::operator-> (void) { return this->ptr_; } -ACE_INLINE TAO_Object_Manager<CORBA_DomainManager, CORBA_DomainManager_var> -CORBA_DomainManagerList_out::operator[] (CORBA::ULong index) +ACE_INLINE TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var> +CORBA::DomainManagerList_out::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } @@ -429,24 +429,24 @@ CORBA_DomainManagerList_out::operator[] (CORBA::ULong index) #endif /* end #if !defined */ -CORBA::Boolean TAO_Export operator<< ( +TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const CORBA_DomainManager_ptr + const CORBA::DomainManager_ptr ); -CORBA::Boolean TAO_Export operator>> ( +TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - CORBA_DomainManager_ptr & + CORBA::DomainManager_ptr & ); -CORBA::Boolean TAO_Export operator<< ( +TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const CORBA_ConstructionPolicy_ptr + const CORBA::ConstructionPolicy_ptr ); -CORBA::Boolean TAO_Export operator>> ( +TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - CORBA_ConstructionPolicy_ptr & + CORBA::ConstructionPolicy_ptr & ); @@ -455,11 +455,12 @@ CORBA::Boolean TAO_Export operator>> ( CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, - const CORBA_DomainManagerList & + const CORBA::DomainManagerList & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, - CORBA_DomainManagerList & + CORBA::DomainManagerList & ); #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_I_ */ + diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl index 684dd9de27e..eccef6a7706 100644 --- a/TAO/tao/Dynamic.pidl +++ b/TAO/tao/Dynamic.pidl @@ -10,8 +10,7 @@ * used to generate code is: * * tao_idl - * -Ge 1 - * -DCORBA3 + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/corbafwd.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl index 0ee395831ba..8c5273acae2 100644 --- a/TAO/tao/DynamicAny/DynamicAny.pidl +++ b/TAO/tao/DynamicAny/DynamicAny.pidl @@ -1,63 +1,55 @@ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// DynamicAny.pidl -// -// = DESCRIPTION -// This file was used to generate the code in DynamicAnyC.{h,i,cpp} -// The file was obtained from the OMG website as part of the full -// CORBA IDL formal/00-04-01: -// http://www.omg.org/technology/documents/formal/corba_omg_idl_text_file.htm -// I couldn't find a copyright notice in the document, but I will -// assume that it is Copyright (C) 2000, OMG. -// We performed some modifications to the file, mainly to use local -// interfaces (part of what is coming in CORBA 2.4 and CORBA 3.0). -// -// The command used to generate code from this file is: -// -// tao_idl.exe -o orig -Gp -Gd -Ge 1 -Gv \ -// -Wb,export_macro=TAO_DynamicAny_Export \ -// -Wb,export_include=dynamicany_export.h \ -// -Wb,pre_include="ace/pre.h" \ -// -Wb,post_include="ace/post.h" \ -// DynamicAny.pidl -// -// after the file is generated a patch must be applied. The patch -// fixes some problems with interceptors and local interfaces and -// disables parts of the code under certain configurations. -// -// Apply patches using the following commands: -// -// patch < diffs/DynamicAnyC.h.diff -// patch < diffs/DynamicAnyC.i.diff -// patch < diffs/DynamicAnyC.cpp.diff -// -// Those changes are required because the generated -// code is part of the TAO library, it hardly makes any sense to -// change the IDL compiler to support changes that are very -// occasional. -// -// Note: The diffs were generated with these commands: -// -// diff -wbu orig/DynamicAny.pidl DynamicAny.pidl > diffs\DynamicAny.pidl.diff -// -// diff -wbu orig/DynamicAnyC.h DynamicAnyC.h > diffs/DynamicAnyC.h.diff -// diff -wbu orig/DynamicAnyC.i DynamicAnyC.i > diffs/DynamicAnyC.i.diff -// diff -wbu orig/DynamicAnyC.cpp DynamicAnyC.cpp > diffs/DynamicAnyC.cpp.diff -// -// ================================================================ +/** + * @file DynamicAny.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the DynamicAny module. + * + * This file is used to generate the code in DynamicAnyC.{h,i,cpp}, it + * was obtained from the OMG website as part of the full CORBA IDL, + * the document reference number is: formal/00-04-01, or use the + * following URL: + * http://www.omg.org/technology/documents/formal/corba_omg_idl_text_file.htm + * + * We couldn't find a copyright notice in the document, but it is safe + * to assume that it is Copyright (C) 2000, OMG. + * + * We performed some modifications to the file, mainly to use local + * interfaces (part of what is coming in CORBA 3.0) + * + * The command used to generate code from this file is: + * + * tao_idl \ + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 \ + * -Wb,export_macro=TAO_DynamicAny_Export \ + * -Wb,export_include=dynamicany_export.h \ + * -Wb,pre_include="ace/pre.h" \ + * -Wb,post_include="ace/post.h" \ + * DynamicAny.pidl + * + * after the file is generated a patch must be applied. The patch + * fixes some problems with interceptors and local interfaces and + * disables parts of the code under certain configurations. + * + * Apply patches using: + * + * patch < diffs/DynamicAny.diff + * + * Note: The diffs are generated using: + * + * for i in DynamicAnyC.{h,i,cpp}; do + * diff -wbu orig/$i $i > diffs/DynamicAny.diff + * done + * + */ #ifndef _DYNAMIC_ANY_IDL_ #define _DYNAMIC_ANY_IDL_ -#pragma prefix "omg.org" + #include <orb.idl> +#pragma prefix "omg.org" + module DynamicAny { local interface DynAny { @@ -98,7 +90,7 @@ module DynamicAny { void insert_wstring(in wstring value) raises(TypeMismatch, InvalidValue); void insert_any( in any value) raises(TypeMismatch, InvalidValue); void insert_dyn_any(in DynAny value) raises(TypeMismatch, InvalidValue); - void insert_val( in CORBA::ValueBase value) raises(TypeMismatch, InvalidValue); + void insert_val( in ValueBase value) raises(TypeMismatch, InvalidValue); boolean get_boolean() raises(TypeMismatch, InvalidValue); octet get_octet() raises(TypeMismatch, InvalidValue); @@ -119,7 +111,7 @@ module DynamicAny { wstring get_wstring() raises(TypeMismatch, InvalidValue); any get_any() raises(TypeMismatch, InvalidValue); DynAny get_dyn_any() raises(TypeMismatch, InvalidValue); - CORBA::ValueBase get_val() raises(TypeMismatch, InvalidValue); + ValueBase get_val() raises(TypeMismatch, InvalidValue); boolean seek(in long index); void rewind(); @@ -221,4 +213,7 @@ module DynamicAny { }; }; // module DynamicAny + +#pragma prefix "" + #endif // _DYNAMIC_ANY_IDL_ diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index 9f70f76273f..515f68e5535 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -21,8 +21,18 @@ #include "DynamicAny.h" +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) @@ -31,8 +41,53 @@ int DynamicAny::DynAny::_tao_class_id = 0; +DynamicAny::DynAny_ptr +tao_DynamicAny_DynAny_duplicate ( + DynamicAny::DynAny_ptr p + ) +{ + return DynamicAny::DynAny::_duplicate (p); +} + +void +tao_DynamicAny_DynAny_release ( + DynamicAny::DynAny_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynAny_ptr +tao_DynamicAny_DynAny_nil ( + void + ) +{ + return DynamicAny::DynAny::_nil (); +} + +DynamicAny::DynAny_ptr +tao_DynamicAny_DynAny_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynAny::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynAny_upcast ( + void *src + ) +{ + DynamicAny::DynAny **tmp = + ACE_static_cast (DynamicAny::DynAny **, src); + return *tmp; +} + // ************************************************************* -// Operations for class DynamicAny::DynAny_var +// DynamicAny::DynAny_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynAny_var::DynAny_var (void) // default constructor @@ -79,7 +134,7 @@ DynamicAny::DynAny_var::operator const ::DynamicAny::DynAny_ptr &() const // cas return this->ptr_; } -DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast +DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast { return this->ptr_; } @@ -155,7 +210,9 @@ DynamicAny::DynAny_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynAny_out +// DynamicAny::DynAny_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynAny_out::DynAny_out (DynAny_ptr &p) @@ -214,12 +271,12 @@ DynamicAny::DynAny_out::operator-> (void) } -// default constructor -DynamicAny::DynAny::DynAny () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynAny::DynAny (void) +{} -// destructor DynamicAny::DynAny::~DynAny (void) {} @@ -231,7 +288,8 @@ DynamicAny::DynAny_ptr DynamicAny::DynAny::_narrow ( return DynAny::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynAny_ptr DynamicAny::DynAny::_unchecked_narrow ( +DynamicAny::DynAny_ptr +DynamicAny::DynAny::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -271,7 +329,7 @@ void *DynamicAny::DynAny::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -279,12 +337,12 @@ void *DynamicAny::DynAny::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynAny::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynAny:1.0"; + return "IDL:omg.org/DynamicAny/DynAny:1.0"; } // Default constructor. DynamicAny::DynAny::InvalidValue::InvalidValue (void) - : CORBA_UserException ("IDL:DynamicAny/DynAny/InvalidValue:1.0") + : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0") { } @@ -307,11 +365,10 @@ DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::Invalid return *this; } -// Narrow. DynamicAny::DynAny::InvalidValue * DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:DynamicAny/DynAny/InvalidValue:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", exc->_id ())) { return ACE_dynamic_cast (InvalidValue *, exc); } @@ -321,6 +378,25 @@ DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *DynamicAny::DynAny::InvalidValue::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::DynamicAny::DynAny::InvalidValue, 0); + return retval; +} + +CORBA::Exception * +DynamicAny::DynAny::InvalidValue::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + DynamicAny::DynAny::InvalidValue (*this), + 0 + ); + return result; +} + void DynamicAny::DynAny::InvalidValue::_raise () { TAO_RAISE (*this); @@ -342,17 +418,9 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *DynamicAny::DynAny::InvalidValue::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::DynamicAny::DynAny::InvalidValue, 0); - return retval; -} - // Default constructor. DynamicAny::DynAny::TypeMismatch::TypeMismatch (void) - : CORBA_UserException ("IDL:DynamicAny/DynAny/TypeMismatch:1.0") + : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0") { } @@ -375,11 +443,10 @@ DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMis return *this; } -// Narrow. DynamicAny::DynAny::TypeMismatch * DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:DynamicAny/DynAny/TypeMismatch:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", exc->_id ())) { return ACE_dynamic_cast (TypeMismatch *, exc); } @@ -389,6 +456,25 @@ DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *DynamicAny::DynAny::TypeMismatch::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::DynamicAny::DynAny::TypeMismatch, 0); + return retval; +} + +CORBA::Exception * +DynamicAny::DynAny::TypeMismatch::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + DynamicAny::DynAny::TypeMismatch (*this), + 0 + ); + return result; +} + void DynamicAny::DynAny::TypeMismatch::_raise () { TAO_RAISE (*this); @@ -410,18 +496,55 @@ void DynamicAny::DynAny::TypeMismatch::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *DynamicAny::DynAny::TypeMismatch::_alloc (void) +int DynamicAny::DynFixed::_tao_class_id = 0; + +DynamicAny::DynFixed_ptr +tao_DynamicAny_DynFixed_duplicate ( + DynamicAny::DynFixed_ptr p + ) { - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::DynamicAny::DynAny::TypeMismatch, 0); - return retval; + return DynamicAny::DynFixed::_duplicate (p); } -int DynamicAny::DynFixed::_tao_class_id = 0; +void +tao_DynamicAny_DynFixed_release ( + DynamicAny::DynFixed_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynFixed_ptr +tao_DynamicAny_DynFixed_nil ( + void + ) +{ + return DynamicAny::DynFixed::_nil (); +} + +DynamicAny::DynFixed_ptr +tao_DynamicAny_DynFixed_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynFixed::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynFixed_upcast ( + void *src + ) +{ + DynamicAny::DynFixed **tmp = + ACE_static_cast (DynamicAny::DynFixed **, src); + return *tmp; +} // ************************************************************* -// Operations for class DynamicAny::DynFixed_var +// DynamicAny::DynFixed_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynFixed_var::DynFixed_var (void) // default constructor @@ -468,7 +591,7 @@ DynamicAny::DynFixed_var::operator const ::DynamicAny::DynFixed_ptr &() const // return this->ptr_; } -DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast +DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast { return this->ptr_; } @@ -544,7 +667,9 @@ DynamicAny::DynFixed_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynFixed_out +// DynamicAny::DynFixed_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynFixed_out::DynFixed_out (DynFixed_ptr &p) @@ -603,12 +728,12 @@ DynamicAny::DynFixed_out::operator-> (void) } -// default constructor -DynamicAny::DynFixed::DynFixed () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynFixed::DynFixed (void) +{} -// destructor DynamicAny::DynFixed::~DynFixed (void) {} @@ -620,7 +745,8 @@ DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_narrow ( return DynFixed::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_unchecked_narrow ( +DynamicAny::DynFixed_ptr +DynamicAny::DynFixed::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -672,7 +798,7 @@ void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -680,13 +806,58 @@ void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynFixed::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynFixed:1.0"; + return "IDL:omg.org/DynamicAny/DynFixed:1.0"; } int DynamicAny::DynEnum::_tao_class_id = 0; +DynamicAny::DynEnum_ptr +tao_DynamicAny_DynEnum_duplicate ( + DynamicAny::DynEnum_ptr p + ) +{ + return DynamicAny::DynEnum::_duplicate (p); +} + +void +tao_DynamicAny_DynEnum_release ( + DynamicAny::DynEnum_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynEnum_ptr +tao_DynamicAny_DynEnum_nil ( + void + ) +{ + return DynamicAny::DynEnum::_nil (); +} + +DynamicAny::DynEnum_ptr +tao_DynamicAny_DynEnum_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynEnum::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynEnum_upcast ( + void *src + ) +{ + DynamicAny::DynEnum **tmp = + ACE_static_cast (DynamicAny::DynEnum **, src); + return *tmp; +} + // ************************************************************* -// Operations for class DynamicAny::DynEnum_var +// DynamicAny::DynEnum_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynEnum_var::DynEnum_var (void) // default constructor @@ -733,7 +904,7 @@ DynamicAny::DynEnum_var::operator const ::DynamicAny::DynEnum_ptr &() const // c return this->ptr_; } -DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast +DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast { return this->ptr_; } @@ -809,7 +980,9 @@ DynamicAny::DynEnum_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynEnum_out +// DynamicAny::DynEnum_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynEnum_out::DynEnum_out (DynEnum_ptr &p) @@ -868,12 +1041,12 @@ DynamicAny::DynEnum_out::operator-> (void) } -// default constructor -DynamicAny::DynEnum::DynEnum () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynEnum::DynEnum (void) +{} -// destructor DynamicAny::DynEnum::~DynEnum (void) {} @@ -885,7 +1058,8 @@ DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_narrow ( return DynEnum::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_unchecked_narrow ( +DynamicAny::DynEnum_ptr +DynamicAny::DynEnum::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -937,7 +1111,7 @@ void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -945,26 +1119,28 @@ void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynEnum::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynEnum:1.0"; + return "IDL:omg.org/DynamicAny/DynEnum:1.0"; } static const CORBA::Long _oc_DynamicAny_FieldName[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d696341), - ACE_NTOHL (0x6e792f46), - ACE_NTOHL (0x69656c64), - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:DynamicAny/FieldName:1.0 + 37, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d696341), + ACE_NTOHL (0x6e792f46), + ACE_NTOHL (0x69656c64), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0 10, - ACE_NTOHL (0x4669656c), - ACE_NTOHL (0x644e616d), + ACE_NTOHL (0x4669656c), + ACE_NTOHL (0x644e616d), ACE_NTOHL (0x65000000), // name = FieldName - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -978,51 +1154,55 @@ static CORBA::TypeCode _tc_TAO_tc_DynamicAny_FieldName ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (DynamicAny) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FieldName, &_tc_TAO_tc_DynamicAny_FieldName) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_FieldName, &_tc_TAO_tc_DynamicAny_FieldName) TAO_NAMESPACE_END static const CORBA::Long _oc_DynamicAny_NameValuePair[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d696341), - ACE_NTOHL (0x6e792f4e), - ACE_NTOHL (0x616d6556), - ACE_NTOHL (0x616c7565), - ACE_NTOHL (0x50616972), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:DynamicAny/NameValuePair:1.0 + 41, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d696341), + ACE_NTOHL (0x6e792f4e), + ACE_NTOHL (0x616d6556), + ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x50616972), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/DynamicAny/NameValuePair:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x65506169), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x65506169), ACE_NTOHL (0x72000000), // name = NameValuePair 2, // member count 3, ACE_NTOHL (0x69640000), // name = id CORBA::tk_alias, // typecode kind for typedefs - 64, // encapsulation length + 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d696341), - ACE_NTOHL (0x6e792f46), - ACE_NTOHL (0x69656c64), - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:DynamicAny/FieldName:1.0 + 37, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d696341), + ACE_NTOHL (0x6e792f46), + ACE_NTOHL (0x69656c64), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0 10, - ACE_NTOHL (0x4669656c), - ACE_NTOHL (0x644e616d), + ACE_NTOHL (0x4669656c), + ACE_NTOHL (0x644e616d), ACE_NTOHL (0x65000000), // name = FieldName - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value CORBA::tk_any, @@ -1038,12 +1218,12 @@ static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePair ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (DynamicAny) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NameValuePair, &_tc_TAO_tc_DynamicAny_NameValuePair) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NameValuePair, &_tc_TAO_tc_DynamicAny_NameValuePair) TAO_NAMESPACE_END -void DynamicAny::NameValuePair::_tao_any_destructor (void *x) +void DynamicAny::NameValuePair::_tao_any_destructor (void *_tao_void_pointer) { - NameValuePair *tmp = ACE_static_cast (NameValuePair*,x); + NameValuePair *tmp = ACE_static_cast (NameValuePair*, _tao_void_pointer); delete tmp; } @@ -1053,48 +1233,48 @@ void DynamicAny::NameValuePair::_tao_any_destructor (void *x) #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_) #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_ - void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_allocate_buffer (CORBA::ULong length) +void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_allocate_buffer (CORBA::ULong length) +{ + DynamicAny::NameValuePair* tmp = 0; + tmp = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (length); + + if (this->buffer_ != 0) { - DynamicAny::NameValuePair* tmp = 0; - tmp = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (length); - - if (this->buffer_ != 0) - { - DynamicAny::NameValuePair *old = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (old); - - } - this->buffer_ = tmp; + DynamicAny::NameValuePair *old = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (old); + } + this->buffer_ = tmp; +} - void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_); - - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp); - this->buffer_ = 0; - } +void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + + DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_); + + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp); + this->buffer_ = 0; +} - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Dtor. - { - this->_deallocate_buffer (); - } +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_) #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CS_ @@ -1106,37 +1286,37 @@ void DynamicAny::NameValuePair::_tao_any_destructor (void *x) DynamicAny::NameValuePairSeq::NameValuePairSeq (void) {} DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq +_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<DynamicAny::NameValuePair> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<DynamicAny::NameValuePair> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::NameValuePair *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq +_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<DynamicAny::NameValuePair> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<DynamicAny::NameValuePair> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} DynamicAny::NameValuePairSeq::NameValuePairSeq (const NameValuePairSeq &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq +_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<DynamicAny::NameValuePair> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<DynamicAny::NameValuePair> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} DynamicAny::NameValuePairSeq::~NameValuePairSeq (void) // dtor {} -void DynamicAny::NameValuePairSeq::_tao_any_destructor (void *x) +void DynamicAny::NameValuePairSeq::_tao_any_destructor (void *_tao_void_pointer) { - NameValuePairSeq *tmp = ACE_static_cast (NameValuePairSeq*,x); + NameValuePairSeq *tmp = ACE_static_cast (NameValuePairSeq*, _tao_void_pointer); delete tmp; } @@ -1146,67 +1326,73 @@ void DynamicAny::NameValuePairSeq::_tao_any_destructor (void *x) static const CORBA::Long _oc_DynamicAny_NameValuePairSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d696341), - ACE_NTOHL (0x6e792f4e), - ACE_NTOHL (0x616d6556), - ACE_NTOHL (0x616c7565), - ACE_NTOHL (0x50616972), - ACE_NTOHL (0x5365713a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:DynamicAny/NameValuePairSeq:1.0 + 44, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d696341), + ACE_NTOHL (0x6e792f4e), + ACE_NTOHL (0x616d6556), + ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x50616972), + ACE_NTOHL (0x5365713a), + ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/DynamicAny/NameValuePairSeq:1.0 17, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x65506169), - ACE_NTOHL (0x72536571), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x65506169), + ACE_NTOHL (0x72536571), ACE_NTOHL (0x0), // name = NameValuePairSeq CORBA::tk_sequence, // typecode kind - 180, // encapsulation length + 196, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 164, // encapsulation length + 180, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d696341), - ACE_NTOHL (0x6e792f4e), - ACE_NTOHL (0x616d6556), - ACE_NTOHL (0x616c7565), - ACE_NTOHL (0x50616972), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:DynamicAny/NameValuePair:1.0 + 41, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d696341), + ACE_NTOHL (0x6e792f4e), + ACE_NTOHL (0x616d6556), + ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x50616972), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/DynamicAny/NameValuePair:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x65506169), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x65506169), ACE_NTOHL (0x72000000), // name = NameValuePair 2, // member count 3, ACE_NTOHL (0x69640000), // name = id CORBA::tk_alias, // typecode kind for typedefs - 64, // encapsulation length + 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d696341), - ACE_NTOHL (0x6e792f46), - ACE_NTOHL (0x69656c64), - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:DynamicAny/FieldName:1.0 + 37, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d696341), + ACE_NTOHL (0x6e792f46), + ACE_NTOHL (0x69656c64), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0 10, - ACE_NTOHL (0x4669656c), - ACE_NTOHL (0x644e616d), + ACE_NTOHL (0x4669656c), + ACE_NTOHL (0x644e616d), ACE_NTOHL (0x65000000), // name = FieldName - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value CORBA::tk_any, @@ -1225,7 +1411,7 @@ static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePairSeq ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (DynamicAny) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NameValuePairSeq, &_tc_TAO_tc_DynamicAny_NameValuePairSeq) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NameValuePairSeq, &_tc_TAO_tc_DynamicAny_NameValuePairSeq) TAO_NAMESPACE_END @@ -1234,48 +1420,48 @@ TAO_NAMESPACE_END #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_) #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_ - void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_allocate_buffer (CORBA::ULong length) +void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_allocate_buffer (CORBA::ULong length) +{ + DynamicAny::NameDynAnyPair* tmp = 0; + tmp = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (length); + + if (this->buffer_ != 0) { - DynamicAny::NameDynAnyPair* tmp = 0; - tmp = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (length); - - if (this->buffer_ != 0) - { - DynamicAny::NameDynAnyPair *old = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (old); - - } - this->buffer_ = tmp; + DynamicAny::NameDynAnyPair *old = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (old); + } + this->buffer_ = tmp; +} - void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_); - - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp); - this->buffer_ = 0; - } +void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + + DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_); + + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp); + this->buffer_ = 0; +} - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Dtor. - { - this->_deallocate_buffer (); - } +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_) #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_ @@ -1287,37 +1473,37 @@ TAO_NAMESPACE_END DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void) {} DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq +_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::NameDynAnyPair *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq +_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (const NameDynAnyPairSeq &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq +_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) // dtor {} -void DynamicAny::NameDynAnyPairSeq::_tao_any_destructor (void *x) +void DynamicAny::NameDynAnyPairSeq::_tao_any_destructor (void *_tao_void_pointer) { - NameDynAnyPairSeq *tmp = ACE_static_cast (NameDynAnyPairSeq*,x); + NameDynAnyPairSeq *tmp = ACE_static_cast (NameDynAnyPairSeq*, _tao_void_pointer); delete tmp; } @@ -1326,8 +1512,53 @@ void DynamicAny::NameDynAnyPairSeq::_tao_any_destructor (void *x) int DynamicAny::DynStruct::_tao_class_id = 0; +DynamicAny::DynStruct_ptr +tao_DynamicAny_DynStruct_duplicate ( + DynamicAny::DynStruct_ptr p + ) +{ + return DynamicAny::DynStruct::_duplicate (p); +} + +void +tao_DynamicAny_DynStruct_release ( + DynamicAny::DynStruct_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynStruct_ptr +tao_DynamicAny_DynStruct_nil ( + void + ) +{ + return DynamicAny::DynStruct::_nil (); +} + +DynamicAny::DynStruct_ptr +tao_DynamicAny_DynStruct_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynStruct::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynStruct_upcast ( + void *src + ) +{ + DynamicAny::DynStruct **tmp = + ACE_static_cast (DynamicAny::DynStruct **, src); + return *tmp; +} + // ************************************************************* -// Operations for class DynamicAny::DynStruct_var +// DynamicAny::DynStruct_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynStruct_var::DynStruct_var (void) // default constructor @@ -1374,7 +1605,7 @@ DynamicAny::DynStruct_var::operator const ::DynamicAny::DynStruct_ptr &() const return this->ptr_; } -DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast +DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast { return this->ptr_; } @@ -1450,7 +1681,9 @@ DynamicAny::DynStruct_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynStruct_out +// DynamicAny::DynStruct_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynStruct_out::DynStruct_out (DynStruct_ptr &p) @@ -1509,12 +1742,12 @@ DynamicAny::DynStruct_out::operator-> (void) } -// default constructor -DynamicAny::DynStruct::DynStruct () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynStruct::DynStruct (void) +{} -// destructor DynamicAny::DynStruct::~DynStruct (void) {} @@ -1526,7 +1759,8 @@ DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_narrow ( return DynStruct::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_unchecked_narrow ( +DynamicAny::DynStruct_ptr +DynamicAny::DynStruct::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -1578,7 +1812,7 @@ void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1586,13 +1820,58 @@ void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynStruct::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynStruct:1.0"; + return "IDL:omg.org/DynamicAny/DynStruct:1.0"; } int DynamicAny::DynUnion::_tao_class_id = 0; +DynamicAny::DynUnion_ptr +tao_DynamicAny_DynUnion_duplicate ( + DynamicAny::DynUnion_ptr p + ) +{ + return DynamicAny::DynUnion::_duplicate (p); +} + +void +tao_DynamicAny_DynUnion_release ( + DynamicAny::DynUnion_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynUnion_ptr +tao_DynamicAny_DynUnion_nil ( + void + ) +{ + return DynamicAny::DynUnion::_nil (); +} + +DynamicAny::DynUnion_ptr +tao_DynamicAny_DynUnion_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynUnion::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynUnion_upcast ( + void *src + ) +{ + DynamicAny::DynUnion **tmp = + ACE_static_cast (DynamicAny::DynUnion **, src); + return *tmp; +} + // ************************************************************* -// Operations for class DynamicAny::DynUnion_var +// DynamicAny::DynUnion_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynUnion_var::DynUnion_var (void) // default constructor @@ -1639,7 +1918,7 @@ DynamicAny::DynUnion_var::operator const ::DynamicAny::DynUnion_ptr &() const // return this->ptr_; } -DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast +DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast { return this->ptr_; } @@ -1715,7 +1994,9 @@ DynamicAny::DynUnion_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynUnion_out +// DynamicAny::DynUnion_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynUnion_out::DynUnion_out (DynUnion_ptr &p) @@ -1774,12 +2055,12 @@ DynamicAny::DynUnion_out::operator-> (void) } -// default constructor -DynamicAny::DynUnion::DynUnion () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynUnion::DynUnion (void) +{} -// destructor DynamicAny::DynUnion::~DynUnion (void) {} @@ -1791,7 +2072,8 @@ DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_narrow ( return DynUnion::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_unchecked_narrow ( +DynamicAny::DynUnion_ptr +DynamicAny::DynUnion::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -1843,7 +2125,7 @@ void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1851,7 +2133,7 @@ void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynUnion::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynUnion:1.0"; + return "IDL:omg.org/DynamicAny/DynUnion:1.0"; } @@ -1860,48 +2142,48 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CS_) #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CS_ - void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_allocate_buffer (CORBA::ULong length) +void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_allocate_buffer (CORBA::ULong length) +{ + CORBA::Any* tmp = 0; + tmp = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (length); + + if (this->buffer_ != 0) { - CORBA::Any* tmp = 0; - tmp = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (old); - - } - this->buffer_ = tmp; + CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (old); + } + this->buffer_ = tmp; +} - void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_); - - _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp); - this->buffer_ = 0; - } +void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + + CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_); + + _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp); + this->buffer_ = 0; +} - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Dtor. - { - this->_deallocate_buffer (); - } +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_DYNAMICANY_ANYSEQ_CS_) #define _DYNAMICANY_ANYSEQ_CS_ @@ -1913,37 +2195,37 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const DynamicAny::AnySeq::AnySeq (void) {} DynamicAny::AnySeq::AnySeq (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_AnySeq +_TAO_Unbounded_Sequence_DynamicAny_AnySeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Any> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Any> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} DynamicAny::AnySeq::AnySeq (CORBA::ULong max, CORBA::ULong length, CORBA::Any *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_AnySeq +_TAO_Unbounded_Sequence_DynamicAny_AnySeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Any> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Any> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} DynamicAny::AnySeq::AnySeq (const AnySeq &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_AnySeq +_TAO_Unbounded_Sequence_DynamicAny_AnySeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Any> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Any> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} DynamicAny::AnySeq::~AnySeq (void) // dtor {} -void DynamicAny::AnySeq::_tao_any_destructor (void *x) +void DynamicAny::AnySeq::_tao_any_destructor (void *_tao_void_pointer) { - AnySeq *tmp = ACE_static_cast (AnySeq*,x); + AnySeq *tmp = ACE_static_cast (AnySeq*, _tao_void_pointer); delete tmp; } @@ -1953,16 +2235,18 @@ void DynamicAny::AnySeq::_tao_any_destructor (void *x) static const CORBA::Long _oc_DynamicAny_AnySeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 26, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d696341), - ACE_NTOHL (0x6e792f41), - ACE_NTOHL (0x6e795365), - ACE_NTOHL (0x713a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:DynamicAny/AnySeq:1.0 + 34, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d696341), + ACE_NTOHL (0x6e792f41), + ACE_NTOHL (0x6e795365), + ACE_NTOHL (0x713a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/DynamicAny/AnySeq:1.0 7, - ACE_NTOHL (0x416e7953), + ACE_NTOHL (0x416e7953), ACE_NTOHL (0x65710000), // name = AnySeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -1983,7 +2267,7 @@ static CORBA::TypeCode _tc_TAO_tc_DynamicAny_AnySeq ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (DynamicAny) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AnySeq, &_tc_TAO_tc_DynamicAny_AnySeq) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AnySeq, &_tc_TAO_tc_DynamicAny_AnySeq) TAO_NAMESPACE_END @@ -1992,93 +2276,93 @@ TAO_NAMESPACE_END #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CS_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CS_ - // The Base_Sequence functions, please see tao/Sequence.h - void - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_allocate_buffer (CORBA::ULong length) - { - DynamicAny::DynAny **tmp = 0; - tmp = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (length); - - if (this->buffer_ != 0) - { - DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_); - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - if (!this->release_) - { - tmp[i] = DynamicAny::DynAny::_duplicate (old[i]); - } - else - { - tmp[i] = old[i]; - } - } - - if (this->release_) - { - delete[] old; - } - } - this->buffer_ = tmp; - } - - void - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_deallocate_buffer (void) +// The Base_Sequence functions, please see tao/Sequence.h +void +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_allocate_buffer (CORBA::ULong length) +{ + DynamicAny::DynAny **tmp = 0; + tmp = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (length); + + if (this->buffer_ != 0) { - if (this->buffer_ == 0 || this->release_ == 0) - return; - DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_); - + DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - CORBA::release (tmp[i]); - tmp[i] = DynamicAny::DynAny::_nil (); + if (!this->release_) + { + tmp[i] = DynamicAny::DynAny::_duplicate (old[i]); + } + else + { + tmp[i] = old[i]; + } + } + + if (this->release_) + { + delete[] old; } - - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp); - this->buffer_ = 0; } + this->buffer_ = tmp; +} - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::~_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void) - { - this->_deallocate_buffer (); - } +void +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + { + CORBA::release (tmp[i]); + tmp[i] = DynamicAny::DynAny::_nil (); + } + + _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp); + this->buffer_ = 0; +} - void - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) - { - DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_); +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::~_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void) +{ + this->_deallocate_buffer (); +} - for (CORBA::ULong i = nl; i < ol; ++i) - { - CORBA::release (tmp[i]); - tmp[i] = DynamicAny::DynAny::_nil (); - } - } +void +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) +{ + DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_); + + for (CORBA::ULong i = nl; i < ol; ++i) + { + CORBA::release (tmp[i]); + tmp[i] = DynamicAny::DynAny::_nil (); + } +} - void - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast ( - void* target, - CORBA_Object *src - ACE_ENV_ARG_DECL - ) - { - DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, target); - *tmp = DynamicAny::DynAny::_narrow (src ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } +void +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast ( + void* target, + CORBA_Object *src + ACE_ENV_ARG_DECL + ) +{ + DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, target); + *tmp = DynamicAny::DynAny::_narrow (src ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} - CORBA_Object* - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_upcast (void *src) const - { - DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, src); - return *tmp; - } +CORBA_Object* +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_upcast (void *src) const +{ + DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, src); + return *tmp; +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_DYNAMICANY_DYNANYSEQ_CS_) #define _DYNAMICANY_DYNANYSEQ_CS_ @@ -2090,37 +2374,37 @@ TAO_NAMESPACE_END DynamicAny::DynAnySeq::DynAnySeq (void) {} DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq +_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::DynAny_ptr *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq +_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} DynamicAny::DynAnySeq::DynAnySeq (const DynAnySeq &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq +_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} DynamicAny::DynAnySeq::~DynAnySeq (void) // dtor {} -void DynamicAny::DynAnySeq::_tao_any_destructor (void *x) +void DynamicAny::DynAnySeq::_tao_any_destructor (void *_tao_void_pointer) { - DynAnySeq *tmp = ACE_static_cast (DynAnySeq*,x); + DynAnySeq *tmp = ACE_static_cast (DynAnySeq*, _tao_void_pointer); delete tmp; } @@ -2129,8 +2413,53 @@ void DynamicAny::DynAnySeq::_tao_any_destructor (void *x) int DynamicAny::DynSequence::_tao_class_id = 0; +DynamicAny::DynSequence_ptr +tao_DynamicAny_DynSequence_duplicate ( + DynamicAny::DynSequence_ptr p + ) +{ + return DynamicAny::DynSequence::_duplicate (p); +} + +void +tao_DynamicAny_DynSequence_release ( + DynamicAny::DynSequence_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynSequence_ptr +tao_DynamicAny_DynSequence_nil ( + void + ) +{ + return DynamicAny::DynSequence::_nil (); +} + +DynamicAny::DynSequence_ptr +tao_DynamicAny_DynSequence_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynSequence_upcast ( + void *src + ) +{ + DynamicAny::DynSequence **tmp = + ACE_static_cast (DynamicAny::DynSequence **, src); + return *tmp; +} + // ************************************************************* -// Operations for class DynamicAny::DynSequence_var +// DynamicAny::DynSequence_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynSequence_var::DynSequence_var (void) // default constructor @@ -2177,7 +2506,7 @@ DynamicAny::DynSequence_var::operator const ::DynamicAny::DynSequence_ptr &() co return this->ptr_; } -DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast +DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast { return this->ptr_; } @@ -2253,7 +2582,9 @@ DynamicAny::DynSequence_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynSequence_out +// DynamicAny::DynSequence_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynSequence_out::DynSequence_out (DynSequence_ptr &p) @@ -2312,12 +2643,12 @@ DynamicAny::DynSequence_out::operator-> (void) } -// default constructor -DynamicAny::DynSequence::DynSequence () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynSequence::DynSequence (void) +{} -// destructor DynamicAny::DynSequence::~DynSequence (void) {} @@ -2329,7 +2660,8 @@ DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_narrow ( return DynSequence::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_unchecked_narrow ( +DynamicAny::DynSequence_ptr +DynamicAny::DynSequence::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -2381,7 +2713,7 @@ void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2389,13 +2721,58 @@ void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynSequence::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynSequence:1.0"; + return "IDL:omg.org/DynamicAny/DynSequence:1.0"; } int DynamicAny::DynArray::_tao_class_id = 0; +DynamicAny::DynArray_ptr +tao_DynamicAny_DynArray_duplicate ( + DynamicAny::DynArray_ptr p + ) +{ + return DynamicAny::DynArray::_duplicate (p); +} + +void +tao_DynamicAny_DynArray_release ( + DynamicAny::DynArray_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynArray_ptr +tao_DynamicAny_DynArray_nil ( + void + ) +{ + return DynamicAny::DynArray::_nil (); +} + +DynamicAny::DynArray_ptr +tao_DynamicAny_DynArray_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynArray_upcast ( + void *src + ) +{ + DynamicAny::DynArray **tmp = + ACE_static_cast (DynamicAny::DynArray **, src); + return *tmp; +} + // ************************************************************* -// Operations for class DynamicAny::DynArray_var +// DynamicAny::DynArray_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynArray_var::DynArray_var (void) // default constructor @@ -2442,7 +2819,7 @@ DynamicAny::DynArray_var::operator const ::DynamicAny::DynArray_ptr &() const // return this->ptr_; } -DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast +DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast { return this->ptr_; } @@ -2518,7 +2895,9 @@ DynamicAny::DynArray_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynArray_out +// DynamicAny::DynArray_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynArray_out::DynArray_out (DynArray_ptr &p) @@ -2577,12 +2956,12 @@ DynamicAny::DynArray_out::operator-> (void) } -// default constructor -DynamicAny::DynArray::DynArray () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynArray::DynArray (void) +{} -// destructor DynamicAny::DynArray::~DynArray (void) {} @@ -2594,7 +2973,8 @@ DynamicAny::DynArray_ptr DynamicAny::DynArray::_narrow ( return DynArray::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynArray_ptr DynamicAny::DynArray::_unchecked_narrow ( +DynamicAny::DynArray_ptr +DynamicAny::DynArray::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -2646,7 +3026,7 @@ void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2654,13 +3034,58 @@ void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynArray::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynArray:1.0"; + return "IDL:omg.org/DynamicAny/DynArray:1.0"; } int DynamicAny::DynValue::_tao_class_id = 0; +DynamicAny::DynValue_ptr +tao_DynamicAny_DynValue_duplicate ( + DynamicAny::DynValue_ptr p + ) +{ + return DynamicAny::DynValue::_duplicate (p); +} + +void +tao_DynamicAny_DynValue_release ( + DynamicAny::DynValue_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynValue_ptr +tao_DynamicAny_DynValue_nil ( + void + ) +{ + return DynamicAny::DynValue::_nil (); +} + +DynamicAny::DynValue_ptr +tao_DynamicAny_DynValue_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynValue_upcast ( + void *src + ) +{ + DynamicAny::DynValue **tmp = + ACE_static_cast (DynamicAny::DynValue **, src); + return *tmp; +} + // ************************************************************* -// Operations for class DynamicAny::DynValue_var +// DynamicAny::DynValue_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynValue_var::DynValue_var (void) // default constructor @@ -2707,7 +3132,7 @@ DynamicAny::DynValue_var::operator const ::DynamicAny::DynValue_ptr &() const // return this->ptr_; } -DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast +DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast { return this->ptr_; } @@ -2783,7 +3208,9 @@ DynamicAny::DynValue_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynValue_out +// DynamicAny::DynValue_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynValue_out::DynValue_out (DynValue_ptr &p) @@ -2842,12 +3269,12 @@ DynamicAny::DynValue_out::operator-> (void) } -// default constructor -DynamicAny::DynValue::DynValue () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynValue::DynValue (void) +{} -// destructor DynamicAny::DynValue::~DynValue (void) {} @@ -2859,7 +3286,8 @@ DynamicAny::DynValue_ptr DynamicAny::DynValue::_narrow ( return DynValue::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynValue_ptr DynamicAny::DynValue::_unchecked_narrow ( +DynamicAny::DynValue_ptr +DynamicAny::DynValue::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -2911,7 +3339,7 @@ void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2919,13 +3347,58 @@ void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynValue::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynValue:1.0"; + return "IDL:omg.org/DynamicAny/DynValue:1.0"; } int DynamicAny::DynAnyFactory::_tao_class_id = 0; +DynamicAny::DynAnyFactory_ptr +tao_DynamicAny_DynAnyFactory_duplicate ( + DynamicAny::DynAnyFactory_ptr p + ) +{ + return DynamicAny::DynAnyFactory::_duplicate (p); +} + +void +tao_DynamicAny_DynAnyFactory_release ( + DynamicAny::DynAnyFactory_ptr p + ) +{ + CORBA::release (p); +} + +DynamicAny::DynAnyFactory_ptr +tao_DynamicAny_DynAnyFactory_nil ( + void + ) +{ + return DynamicAny::DynAnyFactory::_nil (); +} + +DynamicAny::DynAnyFactory_ptr +tao_DynamicAny_DynAnyFactory_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_DynamicAny_DynAnyFactory_upcast ( + void *src + ) +{ + DynamicAny::DynAnyFactory **tmp = + ACE_static_cast (DynamicAny::DynAnyFactory **, src); + return *tmp; +} + // ************************************************************* -// Operations for class DynamicAny::DynAnyFactory_var +// DynamicAny::DynAnyFactory_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* DynamicAny::DynAnyFactory_var::DynAnyFactory_var (void) // default constructor @@ -2972,7 +3445,7 @@ DynamicAny::DynAnyFactory_var::operator const ::DynamicAny::DynAnyFactory_ptr &( return this->ptr_; } -DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast +DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast { return this->ptr_; } @@ -3048,7 +3521,9 @@ DynamicAny::DynAnyFactory_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class DynamicAny::DynAnyFactory_out +// DynamicAny::DynAnyFactory_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_ptr &p) @@ -3107,12 +3582,12 @@ DynamicAny::DynAnyFactory_out::operator-> (void) } -// default constructor -DynamicAny::DynAnyFactory::DynAnyFactory () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +DynamicAny::DynAnyFactory::DynAnyFactory (void) +{} -// destructor DynamicAny::DynAnyFactory::~DynAnyFactory (void) {} @@ -3124,7 +3599,8 @@ DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_narrow ( return DynAnyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_unchecked_narrow ( +DynamicAny::DynAnyFactory_ptr +DynamicAny::DynAnyFactory::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -3164,7 +3640,7 @@ void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -3172,12 +3648,12 @@ void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptr_arith_t type) const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const { - return "IDL:DynamicAny/DynAnyFactory:1.0"; + return "IDL:omg.org/DynamicAny/DynAnyFactory:1.0"; } // Default constructor. DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void) - : CORBA_UserException ("IDL:DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0") + : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0") { } @@ -3200,11 +3676,10 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny:: return *this; } -// Narrow. DynamicAny::DynAnyFactory::InconsistentTypeCode * DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", exc->_id ())) { return ACE_dynamic_cast (InconsistentTypeCode *, exc); } @@ -3214,6 +3689,25 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *ex } } +CORBA::Exception *DynamicAny::DynAnyFactory::InconsistentTypeCode::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::DynamicAny::DynAnyFactory::InconsistentTypeCode, 0); + return retval; +} + +CORBA::Exception * +DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + DynamicAny::DynAnyFactory::InconsistentTypeCode (*this), + 0 + ); + return result; +} + void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise () { TAO_RAISE (*this); @@ -3235,14 +3729,6 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *DynamicAny::DynAnyFactory::InconsistentTypeCode::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::DynamicAny::DynAnyFactory::InconsistentTypeCode, 0); - return retval; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) template class TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>; @@ -3300,13 +3786,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -3391,13 +3877,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -3496,13 +3982,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::AnySeq ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -3600,8 +4086,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) @@ -3642,8 +4133,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index e7ced264d57..1d6e15fa236 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -60,48 +60,51 @@ TAO_NAMESPACE DynamicAny { - + #if !defined (_DYNAMICANY_DYNANY___PTR_CH_) #define _DYNAMICANY_DYNANY___PTR_CH_ - + class DynAny; typedef DynAny *DynAny_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANY___VAR_CH_) #define _DYNAMICANY_DYNANY___VAR_CH_ - + class TAO_DynamicAny_Export DynAny_var : public TAO_Base_var { public: DynAny_var (void); // default constructor - DynAny_var (DynAny_ptr p) : ptr_ (p) {} + DynAny_var (DynAny_ptr p) : ptr_ (p) {} DynAny_var (const DynAny_var &); // copy constructor ~DynAny_var (void); // destructor - + DynAny_var &operator= (DynAny_ptr); DynAny_var &operator= (const DynAny_var &); DynAny_ptr operator-> (void) const; - + operator const DynAny_ptr &() const; operator DynAny_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynAny_ptr in (void) const; DynAny_ptr &inout (void); DynAny_ptr &out (void); DynAny_ptr _retn (void); DynAny_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynAny_ptr tao_duplicate (DynAny_ptr); static void tao_release (DynAny_ptr); static DynAny_ptr tao_nil (void); - static DynAny_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynAny_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynAny_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -111,11 +114,11 @@ TAO_NAMESPACE DynamicAny #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANY___OUT_CH_) #define _DYNAMICANY_DYNANY___OUT_CH_ - + class TAO_DynamicAny_Export DynAny_out { public: @@ -128,19 +131,20 @@ TAO_NAMESPACE DynamicAny operator DynAny_ptr &(); DynAny_ptr &ptr (void); DynAny_ptr operator-> (void); - + private: DynAny_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANY_CH_) #define _DYNAMICANY_DYNANY_CH_ - -class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object + + class TAO_DynamicAny_Export DynAny + : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -148,635 +152,662 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object typedef DynAny_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynAny_ptr _duplicate (DynAny_ptr obj); + static DynAny_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynAny_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynAny_ptr _nil (void) { return (DynAny_ptr)0; } - - + + #if !defined (_DYNAMICANY_DYNANY_INVALIDVALUE_CH_) #define _DYNAMICANY_DYNANY_INVALIDVALUE_CH_ - + class TAO_DynamicAny_Export InvalidValue : public CORBA::UserException { public: - + InvalidValue (void); - // Default constructor. - InvalidValue (const InvalidValue &); - // Copy constructor. - ~InvalidValue (void); - // Destructor. InvalidValue &operator= (const InvalidValue &); + static InvalidValue *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - - static InvalidValue *_downcast (CORBA::Exception *); - - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception DynamicAny::DynAny::InvalidValue. + + + }; #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANY_TYPEMISMATCH_CH_) #define _DYNAMICANY_DYNANY_TYPEMISMATCH_CH_ - + class TAO_DynamicAny_Export TypeMismatch : public CORBA::UserException { public: - + TypeMismatch (void); - // Default constructor. - TypeMismatch (const TypeMismatch &); - // Copy constructor. - ~TypeMismatch (void); - // Destructor. TypeMismatch &operator= (const TypeMismatch &); + static TypeMismatch *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - - static TypeMismatch *_downcast (CORBA::Exception *); - - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception DynamicAny::DynAny::TypeMismatch. + + + }; #endif /* end #if !defined */ - + virtual CORBA::TypeCode_ptr type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void assign ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch )) = 0; - + virtual void from_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Any * to_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Boolean equal ( DynamicAny::DynAny_ptr dyn_any - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - virtual DynamicAny::DynAny_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::DynAny_ptr copy ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void insert_boolean ( CORBA::Boolean value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_octet ( CORBA::Octet value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_char ( CORBA::Char value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_short ( CORBA::Short value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_ushort ( CORBA::UShort value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_long ( CORBA::Long value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_ulong ( CORBA::ULong value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_float ( CORBA::Float value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_double ( CORBA::Double value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_string ( const char * value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_reference ( CORBA::Object_ptr value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_typecode ( CORBA::TypeCode_ptr value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_longlong ( CORBA::LongLong value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_ulonglong ( CORBA::ULongLong value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_longdouble ( CORBA::LongDouble value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_wchar ( CORBA::WChar value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_wstring ( const CORBA::WChar * value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_dyn_any ( DynamicAny::DynAny_ptr value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void insert_val ( CORBA::ValueBase_ptr value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Boolean get_boolean ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Octet get_octet ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Char get_char ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Short get_short ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::UShort get_ushort ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Long get_long ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::ULong get_ulong ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Float get_float ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Double get_double ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual char * get_string ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Object_ptr get_reference ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::TypeCode_ptr get_typecode ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::LongLong get_longlong ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::ULongLong get_ulonglong ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::LongDouble get_longdouble ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::WChar get_wchar ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::WChar * get_wstring ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Any * get_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - - virtual DynamicAny::DynAny_ptr get_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::DynAny_ptr get_dyn_any ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::ValueBase_ptr get_val ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::Boolean seek ( CORBA::Long index - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void rewind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Boolean next ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::ULong component_count ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - virtual DynamicAny::DynAny_ptr current_component ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::DynAny_ptr current_component ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynAny (); - + DynAny (void); + virtual ~DynAny (void); + private: DynAny (const DynAny &); void operator= (const DynAny &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNFIXED___PTR_CH_) #define _DYNAMICANY_DYNFIXED___PTR_CH_ - + class DynFixed; typedef DynFixed *DynFixed_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNFIXED___VAR_CH_) #define _DYNAMICANY_DYNFIXED___VAR_CH_ - + class TAO_DynamicAny_Export DynFixed_var : public TAO_Base_var { public: DynFixed_var (void); // default constructor - DynFixed_var (DynFixed_ptr p) : ptr_ (p) {} + DynFixed_var (DynFixed_ptr p) : ptr_ (p) {} DynFixed_var (const DynFixed_var &); // copy constructor ~DynFixed_var (void); // destructor - + DynFixed_var &operator= (DynFixed_ptr); DynFixed_var &operator= (const DynFixed_var &); DynFixed_ptr operator-> (void) const; - + operator const DynFixed_ptr &() const; operator DynFixed_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynFixed_ptr in (void) const; DynFixed_ptr &inout (void); DynFixed_ptr &out (void); DynFixed_ptr _retn (void); DynFixed_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynFixed_ptr tao_duplicate (DynFixed_ptr); static void tao_release (DynFixed_ptr); static DynFixed_ptr tao_nil (void); - static DynFixed_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynFixed_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynFixed_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -786,11 +817,11 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNFIXED___OUT_CH_) #define _DYNAMICANY_DYNFIXED___OUT_CH_ - + class TAO_DynamicAny_Export DynFixed_out { public: @@ -803,19 +834,20 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object operator DynFixed_ptr &(); DynFixed_ptr &ptr (void); DynFixed_ptr operator-> (void); - + private: DynFixed_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNFIXED_CH_) #define _DYNAMICANY_DYNFIXED_CH_ - -class TAO_DynamicAny_Export DynFixed: public virtual DynAny + + class TAO_DynamicAny_Export DynFixed + : public virtual DynamicAny::DynAny { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -823,98 +855,106 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny typedef DynFixed_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynFixed_ptr _duplicate (DynFixed_ptr obj); + static DynFixed_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynFixed_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynFixed_ptr _nil (void) { return (DynFixed_ptr)0; } - + virtual char * get_value ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::Boolean set_value ( const char * val - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynFixed (); - + DynFixed (void); + virtual ~DynFixed (void); + private: DynFixed (const DynFixed &); void operator= (const DynFixed &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNENUM___PTR_CH_) #define _DYNAMICANY_DYNENUM___PTR_CH_ - + class DynEnum; typedef DynEnum *DynEnum_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNENUM___VAR_CH_) #define _DYNAMICANY_DYNENUM___VAR_CH_ - + class TAO_DynamicAny_Export DynEnum_var : public TAO_Base_var { public: DynEnum_var (void); // default constructor - DynEnum_var (DynEnum_ptr p) : ptr_ (p) {} + DynEnum_var (DynEnum_ptr p) : ptr_ (p) {} DynEnum_var (const DynEnum_var &); // copy constructor ~DynEnum_var (void); // destructor - + DynEnum_var &operator= (DynEnum_ptr); DynEnum_var &operator= (const DynEnum_var &); DynEnum_ptr operator-> (void) const; - + operator const DynEnum_ptr &() const; operator DynEnum_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynEnum_ptr in (void) const; DynEnum_ptr &inout (void); DynEnum_ptr &out (void); DynEnum_ptr _retn (void); DynEnum_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynEnum_ptr tao_duplicate (DynEnum_ptr); static void tao_release (DynEnum_ptr); static DynEnum_ptr tao_nil (void); - static DynEnum_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynEnum_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynEnum_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -924,11 +964,11 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNENUM___OUT_CH_) #define _DYNAMICANY_DYNENUM___OUT_CH_ - + class TAO_DynamicAny_Export DynEnum_out { public: @@ -941,19 +981,20 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny operator DynEnum_ptr &(); DynEnum_ptr &ptr (void); DynEnum_ptr operator-> (void); - + private: DynEnum_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNENUM_CH_) #define _DYNAMICANY_DYNENUM_CH_ - -class TAO_DynamicAny_Export DynEnum: public virtual DynAny + + class TAO_DynamicAny_Export DynEnum + : public virtual DynamicAny::DynAny { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -961,121 +1002,129 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny typedef DynEnum_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynEnum_ptr _duplicate (DynEnum_ptr obj); + static DynEnum_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynEnum_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynEnum_ptr _nil (void) { return (DynEnum_ptr)0; } - + virtual char * get_as_string ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_as_string ( const char * value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::ULong get_as_ulong ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_as_ulong ( CORBA::ULong value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynEnum (); - + DynEnum (void); + virtual ~DynEnum (void); + private: DynEnum (const DynEnum &); void operator= (const DynEnum &); }; - - + + #endif /* end #if !defined */ - + typedef char * FieldName; typedef CORBA::String_var FieldName_var; typedef CORBA::String_out FieldName_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FieldName; - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FieldName; + struct NameValuePair; class NameValuePair_var; - + struct TAO_DynamicAny_Export NameValuePair { - + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef NameValuePair_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ static void _tao_any_destructor (void*); - + TAO_String_Manager id; CORBA::Any value; + }; - + class TAO_DynamicAny_Export NameValuePair_var { public: - NameValuePair_var (void); // default constructor + NameValuePair_var (void); NameValuePair_var (NameValuePair *); - NameValuePair_var (const NameValuePair_var &); // copy constructor - ~NameValuePair_var (void); // destructor - + NameValuePair_var (const NameValuePair_var &); + ~NameValuePair_var (void); + NameValuePair_var &operator= (NameValuePair *); NameValuePair_var &operator= (const NameValuePair_var &); NameValuePair *operator-> (void); const NameValuePair *operator-> (void) const; - + operator const NameValuePair &() const; operator NameValuePair &(); operator NameValuePair &() const; - operator NameValuePair *&(); // variable-size types only - - // in, inout, out, _retn + // Variable-size types only. + operator NameValuePair *&(); + + // in, inout, out, _retn const NameValuePair &in (void) const; NameValuePair &inout (void); NameValuePair *&out (void); NameValuePair *_retn (void); NameValuePair *ptr (void) const; - + private: NameValuePair *ptr_; }; - + class TAO_DynamicAny_Export NameValuePair_out { public: @@ -1087,143 +1136,154 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny operator NameValuePair *&(); NameValuePair *&ptr (void); NameValuePair *operator-> (void); - + private: NameValuePair *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const NameValuePair_var &); }; - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NameValuePair; - - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NameValuePair; + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_) #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_ - - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void); // Default constructor. - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum, + + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void); + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq ( + CORBA::ULong maximum, CORBA::ULong length, NameValuePair *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs); - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs); - virtual ~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void); // Dtor. - // = Accessors. - NameValuePair &operator[] (CORBA::ULong i); - const NameValuePair &operator[] (CORBA::ULong i) const; - // = Static operations. - static NameValuePair *allocbuf (CORBA::ULong size); - static void freebuf (NameValuePair *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - NameValuePair *get_buffer (CORBA::Boolean orphan = 0); - const NameValuePair *get_buffer (void) const; - void replace (CORBA::ULong max, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq ( + const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs + ); + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &operator= ( + const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs + ); + virtual ~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void); + + // = Accessors. + NameValuePair &operator[] (CORBA::ULong i); + const NameValuePair &operator[] (CORBA::ULong i) const; + + // = Static operations. + static NameValuePair *allocbuf (CORBA::ULong size); + static void freebuf (NameValuePair *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + NameValuePair *get_buffer (CORBA::Boolean orphan = 0); + const NameValuePair *get_buffer (void) const; + void replace ( + CORBA::ULong max, CORBA::ULong length, NameValuePair *data, - CORBA::Boolean release); - }; - + CORBA::Boolean release + ); + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_) #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_ - + class NameValuePairSeq; class NameValuePairSeq_var; - + // ************************************************************* // NameValuePairSeq // ************************************************************* - - class TAO_DynamicAny_Export NameValuePairSeq : public + + class TAO_DynamicAny_Export NameValuePairSeq : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<NameValuePair> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<NameValuePair> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: NameValuePairSeq (void); // default ctor NameValuePairSeq (CORBA::ULong max); // uses max size NameValuePairSeq ( - CORBA::ULong max, - CORBA::ULong length, - NameValuePair *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + NameValuePair *buffer, + CORBA::Boolean release = 0 + ); NameValuePairSeq (const NameValuePairSeq &); // copy ctor ~NameValuePairSeq (void); static void _tao_any_destructor (void*); - + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef NameValuePairSeq_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - + + }; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ___VAR_CH_) #define _DYNAMICANY_NAMEVALUEPAIRSEQ___VAR_CH_ - + // ************************************************************* // class DynamicAny::NameValuePairSeq_var // ************************************************************* - + class TAO_DynamicAny_Export NameValuePairSeq_var { public: - NameValuePairSeq_var (void); // default constructor + NameValuePairSeq_var (void); NameValuePairSeq_var (NameValuePairSeq *); - NameValuePairSeq_var (const NameValuePairSeq_var &); // copy constructor - ~NameValuePairSeq_var (void); // destructor - + NameValuePairSeq_var (const NameValuePairSeq_var &); + ~NameValuePairSeq_var (void); + NameValuePairSeq_var &operator= (NameValuePairSeq *); NameValuePairSeq_var &operator= (const NameValuePairSeq_var &); NameValuePairSeq *operator-> (void); const NameValuePairSeq *operator-> (void) const; - + operator const NameValuePairSeq &() const; operator NameValuePairSeq &(); operator NameValuePairSeq &() const; operator NameValuePairSeq *&(); // variable-size base types only - + NameValuePair & operator[] (CORBA::ULong index); const NameValuePair & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const NameValuePairSeq &in (void) const; NameValuePairSeq &inout (void); NameValuePairSeq *&out (void); NameValuePairSeq *_retn (void); NameValuePairSeq *ptr (void) const; - + private: NameValuePairSeq *ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ___OUT_CH_) #define _DYNAMICANY_NAMEVALUEPAIRSEQ___OUT_CH_ - + class TAO_DynamicAny_Export NameValuePairSeq_out { public: @@ -1236,61 +1296,63 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny NameValuePairSeq *&ptr (void); NameValuePairSeq *operator-> (void); NameValuePair & operator[] (CORBA::ULong index); - + private: NameValuePairSeq *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const NameValuePairSeq_var &); }; - - + + #endif /* end #if !defined */ - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NameValuePairSeq; - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NameValuePairSeq; + struct NameDynAnyPair; class NameDynAnyPair_var; - + struct TAO_DynamicAny_Export NameDynAnyPair { - + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef NameDynAnyPair_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - TAO_String_Manager id; + TAO_String_Manager id; ACE_NESTED_CLASS (DynamicAny, DynAny_var) value; + }; - + class TAO_DynamicAny_Export NameDynAnyPair_var { public: - NameDynAnyPair_var (void); // default constructor + NameDynAnyPair_var (void); NameDynAnyPair_var (NameDynAnyPair *); - NameDynAnyPair_var (const NameDynAnyPair_var &); // copy constructor - ~NameDynAnyPair_var (void); // destructor - + NameDynAnyPair_var (const NameDynAnyPair_var &); + ~NameDynAnyPair_var (void); + NameDynAnyPair_var &operator= (NameDynAnyPair *); NameDynAnyPair_var &operator= (const NameDynAnyPair_var &); NameDynAnyPair *operator-> (void); const NameDynAnyPair *operator-> (void) const; - + operator const NameDynAnyPair &() const; operator NameDynAnyPair &(); operator NameDynAnyPair &() const; - operator NameDynAnyPair *&(); // variable-size types only - - // in, inout, out, _retn + // Variable-size types only. + operator NameDynAnyPair *&(); + + // in, inout, out, _retn const NameDynAnyPair &in (void) const; NameDynAnyPair &inout (void); NameDynAnyPair *&out (void); NameDynAnyPair *_retn (void); NameDynAnyPair *ptr (void) const; - + private: NameDynAnyPair *ptr_; }; - + class TAO_DynamicAny_Export NameDynAnyPair_out { public: @@ -1302,141 +1364,152 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny operator NameDynAnyPair *&(); NameDynAnyPair *&ptr (void); NameDynAnyPair *operator-> (void); - + private: NameDynAnyPair *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const NameDynAnyPair_var &); }; - - + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_) #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_ - - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void); // Default constructor. - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum, + + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void); + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq ( + CORBA::ULong maximum, CORBA::ULong length, NameDynAnyPair *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs); - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs); - virtual ~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void); // Dtor. - // = Accessors. - NameDynAnyPair &operator[] (CORBA::ULong i); - const NameDynAnyPair &operator[] (CORBA::ULong i) const; - // = Static operations. - static NameDynAnyPair *allocbuf (CORBA::ULong size); - static void freebuf (NameDynAnyPair *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - NameDynAnyPair *get_buffer (CORBA::Boolean orphan = 0); - const NameDynAnyPair *get_buffer (void) const; - void replace (CORBA::ULong max, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq ( + const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs + ); + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &operator= ( + const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs + ); + virtual ~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void); + + // = Accessors. + NameDynAnyPair &operator[] (CORBA::ULong i); + const NameDynAnyPair &operator[] (CORBA::ULong i) const; + + // = Static operations. + static NameDynAnyPair *allocbuf (CORBA::ULong size); + static void freebuf (NameDynAnyPair *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + NameDynAnyPair *get_buffer (CORBA::Boolean orphan = 0); + const NameDynAnyPair *get_buffer (void) const; + void replace ( + CORBA::ULong max, CORBA::ULong length, NameDynAnyPair *data, - CORBA::Boolean release); - }; - + CORBA::Boolean release + ); + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_) #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_ - + class NameDynAnyPairSeq; class NameDynAnyPairSeq_var; - + // ************************************************************* // NameDynAnyPairSeq // ************************************************************* - - class TAO_DynamicAny_Export NameDynAnyPairSeq : public + + class TAO_DynamicAny_Export NameDynAnyPairSeq : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<NameDynAnyPair> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<NameDynAnyPair> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: NameDynAnyPairSeq (void); // default ctor NameDynAnyPairSeq (CORBA::ULong max); // uses max size NameDynAnyPairSeq ( - CORBA::ULong max, - CORBA::ULong length, - NameDynAnyPair *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + NameDynAnyPair *buffer, + CORBA::Boolean release = 0 + ); NameDynAnyPairSeq (const NameDynAnyPairSeq &); // copy ctor ~NameDynAnyPairSeq (void); static void _tao_any_destructor (void*); - + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef NameDynAnyPairSeq_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - + + }; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ___VAR_CH_) #define _DYNAMICANY_NAMEDYNANYPAIRSEQ___VAR_CH_ - + // ************************************************************* // class DynamicAny::NameDynAnyPairSeq_var // ************************************************************* - + class TAO_DynamicAny_Export NameDynAnyPairSeq_var { public: - NameDynAnyPairSeq_var (void); // default constructor + NameDynAnyPairSeq_var (void); NameDynAnyPairSeq_var (NameDynAnyPairSeq *); - NameDynAnyPairSeq_var (const NameDynAnyPairSeq_var &); // copy constructor - ~NameDynAnyPairSeq_var (void); // destructor - + NameDynAnyPairSeq_var (const NameDynAnyPairSeq_var &); + ~NameDynAnyPairSeq_var (void); + NameDynAnyPairSeq_var &operator= (NameDynAnyPairSeq *); NameDynAnyPairSeq_var &operator= (const NameDynAnyPairSeq_var &); NameDynAnyPairSeq *operator-> (void); const NameDynAnyPairSeq *operator-> (void) const; - + operator const NameDynAnyPairSeq &() const; operator NameDynAnyPairSeq &(); operator NameDynAnyPairSeq &() const; operator NameDynAnyPairSeq *&(); // variable-size base types only - + NameDynAnyPair & operator[] (CORBA::ULong index); const NameDynAnyPair & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const NameDynAnyPairSeq &in (void) const; NameDynAnyPairSeq &inout (void); NameDynAnyPairSeq *&out (void); NameDynAnyPairSeq *_retn (void); NameDynAnyPairSeq *ptr (void) const; - + private: NameDynAnyPairSeq *ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ___OUT_CH_) #define _DYNAMICANY_NAMEDYNANYPAIRSEQ___OUT_CH_ - + class TAO_DynamicAny_Export NameDynAnyPairSeq_out { public: @@ -1449,58 +1522,61 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny NameDynAnyPairSeq *&ptr (void); NameDynAnyPairSeq *operator-> (void); NameDynAnyPair & operator[] (CORBA::ULong index); - + private: NameDynAnyPairSeq *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const NameDynAnyPairSeq_var &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNSTRUCT___PTR_CH_) #define _DYNAMICANY_DYNSTRUCT___PTR_CH_ - + class DynStruct; typedef DynStruct *DynStruct_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNSTRUCT___VAR_CH_) #define _DYNAMICANY_DYNSTRUCT___VAR_CH_ - + class TAO_DynamicAny_Export DynStruct_var : public TAO_Base_var { public: DynStruct_var (void); // default constructor - DynStruct_var (DynStruct_ptr p) : ptr_ (p) {} + DynStruct_var (DynStruct_ptr p) : ptr_ (p) {} DynStruct_var (const DynStruct_var &); // copy constructor ~DynStruct_var (void); // destructor - + DynStruct_var &operator= (DynStruct_ptr); DynStruct_var &operator= (const DynStruct_var &); DynStruct_ptr operator-> (void) const; - + operator const DynStruct_ptr &() const; operator DynStruct_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynStruct_ptr in (void) const; DynStruct_ptr &inout (void); DynStruct_ptr &out (void); DynStruct_ptr _retn (void); DynStruct_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynStruct_ptr tao_duplicate (DynStruct_ptr); static void tao_release (DynStruct_ptr); static DynStruct_ptr tao_nil (void); - static DynStruct_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynStruct_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynStruct_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1510,11 +1586,11 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNSTRUCT___OUT_CH_) #define _DYNAMICANY_DYNSTRUCT___OUT_CH_ - + class TAO_DynamicAny_Export DynStruct_out { public: @@ -1527,19 +1603,20 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny operator DynStruct_ptr &(); DynStruct_ptr &ptr (void); DynStruct_ptr operator-> (void); - + private: DynStruct_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNSTRUCT_CH_) #define _DYNAMICANY_DYNSTRUCT_CH_ - -class TAO_DynamicAny_Export DynStruct: public virtual DynAny + + class TAO_DynamicAny_Export DynStruct + : public virtual DynamicAny::DynAny { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1547,133 +1624,144 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny typedef DynStruct_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynStruct_ptr _duplicate (DynStruct_ptr obj); + static DynStruct_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynStruct_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynStruct_ptr _nil (void) { return (DynStruct_ptr)0; } - + virtual char * current_member_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::TCKind current_member_kind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - - virtual DynamicAny::NameValuePairSeq * get_members ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::NameValuePairSeq * get_members ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_members ( const DynamicAny::NameValuePairSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - - virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynStruct (); - + DynStruct (void); + virtual ~DynStruct (void); + private: DynStruct (const DynStruct &); void operator= (const DynStruct &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNUNION___PTR_CH_) #define _DYNAMICANY_DYNUNION___PTR_CH_ - + class DynUnion; typedef DynUnion *DynUnion_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNUNION___VAR_CH_) #define _DYNAMICANY_DYNUNION___VAR_CH_ - + class TAO_DynamicAny_Export DynUnion_var : public TAO_Base_var { public: DynUnion_var (void); // default constructor - DynUnion_var (DynUnion_ptr p) : ptr_ (p) {} + DynUnion_var (DynUnion_ptr p) : ptr_ (p) {} DynUnion_var (const DynUnion_var &); // copy constructor ~DynUnion_var (void); // destructor - + DynUnion_var &operator= (DynUnion_ptr); DynUnion_var &operator= (const DynUnion_var &); DynUnion_ptr operator-> (void) const; - + operator const DynUnion_ptr &() const; operator DynUnion_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynUnion_ptr in (void) const; DynUnion_ptr &inout (void); DynUnion_ptr &out (void); DynUnion_ptr _retn (void); DynUnion_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynUnion_ptr tao_duplicate (DynUnion_ptr); static void tao_release (DynUnion_ptr); static DynUnion_ptr tao_nil (void); - static DynUnion_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynUnion_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynUnion_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1683,11 +1771,11 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNUNION___OUT_CH_) #define _DYNAMICANY_DYNUNION___OUT_CH_ - + class TAO_DynamicAny_Export DynUnion_out { public: @@ -1700,19 +1788,20 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny operator DynUnion_ptr &(); DynUnion_ptr &ptr (void); DynUnion_ptr operator-> (void); - + private: DynUnion_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNUNION_CH_) #define _DYNAMICANY_DYNUNION_CH_ - -class TAO_DynamicAny_Export DynUnion: public virtual DynAny + + class TAO_DynamicAny_Export DynUnion + : public virtual DynamicAny::DynAny { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1720,237 +1809,260 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny typedef DynUnion_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynUnion_ptr _duplicate (DynUnion_ptr obj); + static DynUnion_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynUnion_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynUnion_ptr _nil (void) { return (DynUnion_ptr)0; } - - virtual DynamicAny::DynAny_ptr get_discriminator ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::DynAny_ptr get_discriminator ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_discriminator ( DynamicAny::DynAny_ptr d - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch )) = 0; - + virtual void set_to_default_member ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch )) = 0; - + virtual void set_to_no_active_member ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch )) = 0; - + virtual CORBA::Boolean has_no_active_member ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual CORBA::TCKind discriminator_kind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - virtual DynamicAny::DynAny_ptr member ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::DynAny_ptr member ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual char * member_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::TCKind member_kind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynUnion (); - + DynUnion (void); + virtual ~DynUnion (void); + private: DynUnion (const DynUnion &); void operator= (const DynUnion &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_) #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_ - - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_DynamicAny_AnySeq : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_DynamicAny_AnySeq (void); // Default constructor. - _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum, + + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_AnySeq + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_DynamicAny_AnySeq (void); + _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_DynamicAny_AnySeq ( + CORBA::ULong maximum, CORBA::ULong length, CORBA::Any *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_DynamicAny_AnySeq (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs); - _TAO_Unbounded_Sequence_DynamicAny_AnySeq &operator= (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs); - virtual ~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void); // Dtor. - // = Accessors. - CORBA::Any &operator[] (CORBA::ULong i); - const CORBA::Any &operator[] (CORBA::ULong i) const; - // = Static operations. - static CORBA::Any *allocbuf (CORBA::ULong size); - static void freebuf (CORBA::Any *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - CORBA::Any *get_buffer (CORBA::Boolean orphan = 0); - const CORBA::Any *get_buffer (void) const; - void replace (CORBA::ULong max, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_DynamicAny_AnySeq ( + const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs + ); + _TAO_Unbounded_Sequence_DynamicAny_AnySeq &operator= ( + const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs + ); + virtual ~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void); + + // = Accessors. + CORBA::Any &operator[] (CORBA::ULong i); + const CORBA::Any &operator[] (CORBA::ULong i) const; + + // = Static operations. + static CORBA::Any *allocbuf (CORBA::ULong size); + static void freebuf (CORBA::Any *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + CORBA::Any *get_buffer (CORBA::Boolean orphan = 0); + const CORBA::Any *get_buffer (void) const; + void replace ( + CORBA::ULong max, CORBA::ULong length, CORBA::Any *data, - CORBA::Boolean release); - }; - + CORBA::Boolean release + ); + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_DYNAMICANY_ANYSEQ_CH_) #define _DYNAMICANY_ANYSEQ_CH_ - + class AnySeq; class AnySeq_var; - + // ************************************************************* // AnySeq // ************************************************************* - - class TAO_DynamicAny_Export AnySeq : public + + class TAO_DynamicAny_Export AnySeq : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_DynamicAny_AnySeq + _TAO_Unbounded_Sequence_DynamicAny_AnySeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Any> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Any> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: AnySeq (void); // default ctor AnySeq (CORBA::ULong max); // uses max size AnySeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Any *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + CORBA::Any *buffer, + CORBA::Boolean release = 0 + ); AnySeq (const AnySeq &); // copy ctor ~AnySeq (void); static void _tao_any_destructor (void*); - + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef AnySeq_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - + + }; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_ANYSEQ___VAR_CH_) #define _DYNAMICANY_ANYSEQ___VAR_CH_ - + // ************************************************************* // class DynamicAny::AnySeq_var // ************************************************************* - + class TAO_DynamicAny_Export AnySeq_var { public: - AnySeq_var (void); // default constructor + AnySeq_var (void); AnySeq_var (AnySeq *); - AnySeq_var (const AnySeq_var &); // copy constructor - ~AnySeq_var (void); // destructor - + AnySeq_var (const AnySeq_var &); + ~AnySeq_var (void); + AnySeq_var &operator= (AnySeq *); AnySeq_var &operator= (const AnySeq_var &); AnySeq *operator-> (void); const AnySeq *operator-> (void) const; - + operator const AnySeq &() const; operator AnySeq &(); operator AnySeq &() const; operator AnySeq *&(); // variable-size base types only - + CORBA::Any & operator[] (CORBA::ULong index); const CORBA::Any & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const AnySeq &in (void) const; AnySeq &inout (void); AnySeq *&out (void); AnySeq *_retn (void); AnySeq *ptr (void) const; - + private: AnySeq *ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_ANYSEQ___OUT_CH_) #define _DYNAMICANY_ANYSEQ___OUT_CH_ - + class TAO_DynamicAny_Export AnySeq_out { public: @@ -1963,145 +2075,160 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny AnySeq *&ptr (void); AnySeq *operator-> (void); CORBA::Any & operator[] (CORBA::ULong index); - + private: AnySeq *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const AnySeq_var &); }; - - + + #endif /* end #if !defined */ - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AnySeq; - - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AnySeq; + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_ - - class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void); - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum); - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum, + + class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void); + _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum); + _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq ( + CORBA::ULong maximum, CORBA::ULong length, DynAny* *value, - CORBA::Boolean release = 0); - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs); - virtual ~_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void); - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &operator= (const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs); - TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> operator[] (CORBA::ULong index) const; - static DynAny **allocbuf (CORBA::ULong nelems); - static void freebuf (DynAny **buffer); - // The Base_Sequence functions, please see tao/Sequence.h - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - DynAny* *get_buffer (CORBA::Boolean orphan = 0); - const DynAny* *get_buffer (void) const; - virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol); - virtual void _downcast ( - void* target, - CORBA_Object *src - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - virtual CORBA_Object* _upcast (void *src) const; - - }; - + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq ( + const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs + ); + _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &operator= ( + const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs + ); + virtual ~_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void); + + // = Accessors. + TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> operator[] (CORBA::ULong index) const; + + // = Static operations. + static DynAny **allocbuf (CORBA::ULong nelems); + static void freebuf (DynAny **buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + DynAny* *get_buffer (CORBA::Boolean orphan = 0); + const DynAny* *get_buffer (void) const; + virtual void _shrink_buffer ( + CORBA::ULong nl, + CORBA::ULong ol + ); + + virtual void _downcast ( + void* target, + CORBA_Object *src + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual CORBA_Object* _upcast (void *src) const; + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_DYNAMICANY_DYNANYSEQ_CH_) #define _DYNAMICANY_DYNANYSEQ_CH_ - + class DynAnySeq; class DynAnySeq_var; - + // ************************************************************* // DynAnySeq // ************************************************************* - - class TAO_DynamicAny_Export DynAnySeq : public + + class TAO_DynamicAny_Export DynAnySeq : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq + _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<DynAny,DynAny_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Object_Sequence<DynAny,DynAny_var> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: DynAnySeq (void); // default ctor DynAnySeq (CORBA::ULong max); // uses max size DynAnySeq ( - CORBA::ULong max, - CORBA::ULong length, - DynAny_ptr *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + DynAny_ptr *buffer, + CORBA::Boolean release = 0 + ); DynAnySeq (const DynAnySeq &); // copy ctor ~DynAnySeq (void); static void _tao_any_destructor (void*); - + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef DynAnySeq_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - + + }; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANYSEQ___VAR_CH_) #define _DYNAMICANY_DYNANYSEQ___VAR_CH_ - + // ************************************************************* // class DynamicAny::DynAnySeq_var // ************************************************************* - + class TAO_DynamicAny_Export DynAnySeq_var { public: - DynAnySeq_var (void); // default constructor + DynAnySeq_var (void); DynAnySeq_var (DynAnySeq *); - DynAnySeq_var (const DynAnySeq_var &); // copy constructor - ~DynAnySeq_var (void); // destructor - + DynAnySeq_var (const DynAnySeq_var &); + ~DynAnySeq_var (void); + DynAnySeq_var &operator= (DynAnySeq *); DynAnySeq_var &operator= (const DynAnySeq_var &); DynAnySeq *operator-> (void); const DynAnySeq *operator-> (void) const; - + operator const DynAnySeq &() const; operator DynAnySeq &(); operator DynAnySeq &() const; operator DynAnySeq *&(); // variable-size base types only - + TAO_Object_Manager<DynAny, DynAny_var> operator[] (CORBA::ULong index); - - // in, inout, out, _retn + + // in, inout, out, _retn const DynAnySeq &in (void) const; DynAnySeq &inout (void); DynAnySeq *&out (void); DynAnySeq *_retn (void); DynAnySeq *ptr (void) const; - + private: DynAnySeq *ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANYSEQ___OUT_CH_) #define _DYNAMICANY_DYNANYSEQ___OUT_CH_ - + class TAO_DynamicAny_Export DynAnySeq_out { public: @@ -2114,58 +2241,61 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny DynAnySeq *&ptr (void); DynAnySeq *operator-> (void); TAO_Object_Manager<DynAny, DynAny_var> operator[] (CORBA::ULong index); - + private: DynAnySeq *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const DynAnySeq_var &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNSEQUENCE___PTR_CH_) #define _DYNAMICANY_DYNSEQUENCE___PTR_CH_ - + class DynSequence; typedef DynSequence *DynSequence_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNSEQUENCE___VAR_CH_) #define _DYNAMICANY_DYNSEQUENCE___VAR_CH_ - + class TAO_DynamicAny_Export DynSequence_var : public TAO_Base_var { public: DynSequence_var (void); // default constructor - DynSequence_var (DynSequence_ptr p) : ptr_ (p) {} + DynSequence_var (DynSequence_ptr p) : ptr_ (p) {} DynSequence_var (const DynSequence_var &); // copy constructor ~DynSequence_var (void); // destructor - + DynSequence_var &operator= (DynSequence_ptr); DynSequence_var &operator= (const DynSequence_var &); DynSequence_ptr operator-> (void) const; - + operator const DynSequence_ptr &() const; operator DynSequence_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynSequence_ptr in (void) const; DynSequence_ptr &inout (void); DynSequence_ptr &out (void); DynSequence_ptr _retn (void); DynSequence_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynSequence_ptr tao_duplicate (DynSequence_ptr); static void tao_release (DynSequence_ptr); static DynSequence_ptr tao_nil (void); - static DynSequence_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynSequence_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynSequence_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -2175,11 +2305,11 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNSEQUENCE___OUT_CH_) #define _DYNAMICANY_DYNSEQUENCE___OUT_CH_ - + class TAO_DynamicAny_Export DynSequence_out { public: @@ -2192,19 +2322,20 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny operator DynSequence_ptr &(); DynSequence_ptr &ptr (void); DynSequence_ptr operator-> (void); - + private: DynSequence_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNSEQUENCE_CH_) #define _DYNAMICANY_DYNSEQUENCE_CH_ - -class TAO_DynamicAny_Export DynSequence: public virtual DynAny + + class TAO_DynamicAny_Export DynSequence + : public virtual DynamicAny::DynAny { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -2212,131 +2343,141 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny typedef DynSequence_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynSequence_ptr _duplicate (DynSequence_ptr obj); + static DynSequence_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynSequence_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynSequence_ptr _nil (void) { return (DynSequence_ptr)0; } - + virtual CORBA::ULong get_length ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_length ( CORBA::ULong len - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::InvalidValue )) = 0; - - virtual DynamicAny::AnySeq * get_elements ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::AnySeq * get_elements ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_elements ( const DynamicAny::AnySeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - - virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynSequence (); - + DynSequence (void); + virtual ~DynSequence (void); + private: DynSequence (const DynSequence &); void operator= (const DynSequence &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNARRAY___PTR_CH_) #define _DYNAMICANY_DYNARRAY___PTR_CH_ - + class DynArray; typedef DynArray *DynArray_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNARRAY___VAR_CH_) #define _DYNAMICANY_DYNARRAY___VAR_CH_ - + class TAO_DynamicAny_Export DynArray_var : public TAO_Base_var { public: DynArray_var (void); // default constructor - DynArray_var (DynArray_ptr p) : ptr_ (p) {} + DynArray_var (DynArray_ptr p) : ptr_ (p) {} DynArray_var (const DynArray_var &); // copy constructor ~DynArray_var (void); // destructor - + DynArray_var &operator= (DynArray_ptr); DynArray_var &operator= (const DynArray_var &); DynArray_ptr operator-> (void) const; - + operator const DynArray_ptr &() const; operator DynArray_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynArray_ptr in (void) const; DynArray_ptr &inout (void); DynArray_ptr &out (void); DynArray_ptr _retn (void); DynArray_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynArray_ptr tao_duplicate (DynArray_ptr); static void tao_release (DynArray_ptr); static DynArray_ptr tao_nil (void); - static DynArray_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynArray_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynArray_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -2346,11 +2487,11 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNARRAY___OUT_CH_) #define _DYNAMICANY_DYNARRAY___OUT_CH_ - + class TAO_DynamicAny_Export DynArray_out { public: @@ -2363,19 +2504,20 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny operator DynArray_ptr &(); DynArray_ptr &ptr (void); DynArray_ptr operator-> (void); - + private: DynArray_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNARRAY_CH_) #define _DYNAMICANY_DYNARRAY_CH_ - -class TAO_DynamicAny_Export DynArray: public virtual DynAny + + class TAO_DynamicAny_Export DynArray + : public virtual DynamicAny::DynAny { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -2383,115 +2525,124 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny typedef DynArray_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynArray_ptr _duplicate (DynArray_ptr obj); + static DynArray_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynArray_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynArray_ptr _nil (void) { return (DynArray_ptr)0; } - - virtual DynamicAny::AnySeq * get_elements ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::AnySeq * get_elements ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_elements ( const DynamicAny::AnySeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - - virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_elements_as_dyn_any ( const DynamicAny::DynAnySeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynArray (); - + DynArray (void); + virtual ~DynArray (void); + private: DynArray (const DynArray &); void operator= (const DynArray &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNVALUE___PTR_CH_) #define _DYNAMICANY_DYNVALUE___PTR_CH_ - + class DynValue; typedef DynValue *DynValue_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNVALUE___VAR_CH_) #define _DYNAMICANY_DYNVALUE___VAR_CH_ - + class TAO_DynamicAny_Export DynValue_var : public TAO_Base_var { public: DynValue_var (void); // default constructor - DynValue_var (DynValue_ptr p) : ptr_ (p) {} + DynValue_var (DynValue_ptr p) : ptr_ (p) {} DynValue_var (const DynValue_var &); // copy constructor ~DynValue_var (void); // destructor - + DynValue_var &operator= (DynValue_ptr); DynValue_var &operator= (const DynValue_var &); DynValue_ptr operator-> (void) const; - + operator const DynValue_ptr &() const; operator DynValue_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynValue_ptr in (void) const; DynValue_ptr &inout (void); DynValue_ptr &out (void); DynValue_ptr _retn (void); DynValue_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynValue_ptr tao_duplicate (DynValue_ptr); static void tao_release (DynValue_ptr); static DynValue_ptr tao_nil (void); - static DynValue_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynValue_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynValue_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -2501,11 +2652,11 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNVALUE___OUT_CH_) #define _DYNAMICANY_DYNVALUE___OUT_CH_ - + class TAO_DynamicAny_Export DynValue_out { public: @@ -2518,19 +2669,20 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny operator DynValue_ptr &(); DynValue_ptr &ptr (void); DynValue_ptr operator-> (void); - + private: DynValue_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNVALUE_CH_) #define _DYNAMICANY_DYNVALUE_CH_ - -class TAO_DynamicAny_Export DynValue: public virtual DynAny + + class TAO_DynamicAny_Export DynValue + : public virtual DynamicAny::DynAny { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -2538,133 +2690,144 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny typedef DynValue_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynValue_ptr _duplicate (DynValue_ptr obj); + static DynValue_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynValue_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynValue_ptr _nil (void) { return (DynValue_ptr)0; } - + virtual char * current_member_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual CORBA::TCKind current_member_kind ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - - virtual DynamicAny::NameValuePairSeq * get_members ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::NameValuePairSeq * get_members ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_members ( const DynamicAny::NameValuePairSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - - virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAny::TypeMismatch, - DynamicAny::DynAny::InvalidValue + CORBA::SystemException + , DynamicAny::DynAny::TypeMismatch + , DynamicAny::DynAny::InvalidValue )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynValue (); - + DynValue (void); + virtual ~DynValue (void); + private: DynValue (const DynValue &); void operator= (const DynValue &); }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANYFACTORY___PTR_CH_) #define _DYNAMICANY_DYNANYFACTORY___PTR_CH_ - + class DynAnyFactory; typedef DynAnyFactory *DynAnyFactory_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANYFACTORY___VAR_CH_) #define _DYNAMICANY_DYNANYFACTORY___VAR_CH_ - + class TAO_DynamicAny_Export DynAnyFactory_var : public TAO_Base_var { public: DynAnyFactory_var (void); // default constructor - DynAnyFactory_var (DynAnyFactory_ptr p) : ptr_ (p) {} + DynAnyFactory_var (DynAnyFactory_ptr p) : ptr_ (p) {} DynAnyFactory_var (const DynAnyFactory_var &); // copy constructor ~DynAnyFactory_var (void); // destructor - + DynAnyFactory_var &operator= (DynAnyFactory_ptr); DynAnyFactory_var &operator= (const DynAnyFactory_var &); DynAnyFactory_ptr operator-> (void) const; - + operator const DynAnyFactory_ptr &() const; operator DynAnyFactory_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn DynAnyFactory_ptr in (void) const; DynAnyFactory_ptr &inout (void); DynAnyFactory_ptr &out (void); DynAnyFactory_ptr _retn (void); DynAnyFactory_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static DynAnyFactory_ptr tao_duplicate (DynAnyFactory_ptr); static void tao_release (DynAnyFactory_ptr); static DynAnyFactory_ptr tao_nil (void); - static DynAnyFactory_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static DynAnyFactory_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: DynAnyFactory_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -2674,11 +2837,11 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANYFACTORY___OUT_CH_) #define _DYNAMICANY_DYNANYFACTORY___OUT_CH_ - + class TAO_DynamicAny_Export DynAnyFactory_out { public: @@ -2691,19 +2854,20 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny operator DynAnyFactory_ptr &(); DynAnyFactory_ptr &ptr (void); DynAnyFactory_ptr operator-> (void); - + private: DynAnyFactory_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_DYNAMICANY_DYNANYFACTORY_CH_) #define _DYNAMICANY_DYNANYFACTORY_CH_ - -class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object + + class TAO_DynamicAny_Export DynAnyFactory + : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -2711,99 +2875,99 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object typedef DynAnyFactory_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj); + static DynAnyFactory_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynAnyFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static DynAnyFactory_ptr _nil (void) { return (DynAnyFactory_ptr)0; } - - + + #if !defined (_DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_) #define _DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_ - + class TAO_DynamicAny_Export InconsistentTypeCode : public CORBA::UserException { public: - + InconsistentTypeCode (void); - // Default constructor. - InconsistentTypeCode (const InconsistentTypeCode &); - // Copy constructor. - ~InconsistentTypeCode (void); - // Destructor. InconsistentTypeCode &operator= (const InconsistentTypeCode &); + static InconsistentTypeCode *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - - static InconsistentTypeCode *_downcast (CORBA::Exception *); - - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception DynamicAny::DynAnyFactory::InconsistentTypeCode. + + + }; #endif /* end #if !defined */ - - virtual DynamicAny::DynAny_ptr create_dyn_any ( + + virtual ::DynamicAny::DynAny_ptr create_dyn_any ( const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode + CORBA::SystemException + , DynamicAny::DynAnyFactory::InconsistentTypeCode )) = 0; - - virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code ( + + virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code ( CORBA::TypeCode_ptr type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - DynamicAny::DynAnyFactory::InconsistentTypeCode + CORBA::SystemException + , DynamicAny::DynAnyFactory::InconsistentTypeCode )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - DynAnyFactory (); - + DynAnyFactory (void); + virtual ~DynAnyFactory (void); + private: DynAnyFactory (const DynAnyFactory &); void operator= (const DynAnyFactory &); }; - - + + #endif /* end #if !defined */ - - + + } TAO_NAMESPACE_CLOSE // module DynamicAny diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i index 7451357d1e2..c8d57c489fa 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.i +++ b/TAO/tao/DynamicAny/DynamicAnyC.i @@ -31,49 +31,6 @@ #if !defined (_DYNAMICANY_DYNANY___CI_) #define _DYNAMICANY_DYNANY___CI_ -ACE_INLINE DynamicAny::DynAny_ptr -tao_DynamicAny_DynAny_duplicate ( - DynamicAny::DynAny_ptr p - ) -{ - return DynamicAny::DynAny::_duplicate (p); -} - -ACE_INLINE void -tao_DynamicAny_DynAny_release ( - DynamicAny::DynAny_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE DynamicAny::DynAny_ptr -tao_DynamicAny_DynAny_nil ( - void - ) -{ - return DynamicAny::DynAny::_nil (); -} - -ACE_INLINE DynamicAny::DynAny_ptr -tao_DynamicAny_DynAny_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return DynamicAny::DynAny::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynAny_upcast ( - void *src - ) -{ - DynamicAny::DynAny **tmp = - ACE_static_cast (DynamicAny::DynAny **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -81,49 +38,6 @@ tao_DynamicAny_DynAny_upcast ( #if !defined (_DYNAMICANY_DYNFIXED___CI_) #define _DYNAMICANY_DYNFIXED___CI_ -ACE_INLINE DynamicAny::DynFixed_ptr -tao_DynamicAny_DynFixed_duplicate ( - DynamicAny::DynFixed_ptr p - ) -{ - return DynamicAny::DynFixed::_duplicate (p); -} - -ACE_INLINE void -tao_DynamicAny_DynFixed_release ( - DynamicAny::DynFixed_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE DynamicAny::DynFixed_ptr -tao_DynamicAny_DynFixed_nil ( - void - ) -{ - return DynamicAny::DynFixed::_nil (); -} - -ACE_INLINE DynamicAny::DynFixed_ptr -tao_DynamicAny_DynFixed_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return DynamicAny::DynFixed::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynFixed_upcast ( - void *src - ) -{ - DynamicAny::DynFixed **tmp = - ACE_static_cast (DynamicAny::DynFixed **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -131,49 +45,6 @@ tao_DynamicAny_DynFixed_upcast ( #if !defined (_DYNAMICANY_DYNENUM___CI_) #define _DYNAMICANY_DYNENUM___CI_ -ACE_INLINE DynamicAny::DynEnum_ptr -tao_DynamicAny_DynEnum_duplicate ( - DynamicAny::DynEnum_ptr p - ) -{ - return DynamicAny::DynEnum::_duplicate (p); -} - -ACE_INLINE void -tao_DynamicAny_DynEnum_release ( - DynamicAny::DynEnum_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE DynamicAny::DynEnum_ptr -tao_DynamicAny_DynEnum_nil ( - void - ) -{ - return DynamicAny::DynEnum::_nil (); -} - -ACE_INLINE DynamicAny::DynEnum_ptr -tao_DynamicAny_DynEnum_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return DynamicAny::DynEnum::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynEnum_upcast ( - void *src - ) -{ - DynamicAny::DynEnum **tmp = - ACE_static_cast (DynamicAny::DynEnum **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -228,7 +99,7 @@ DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var { NameValuePair *deep_copy = new NameValuePair (*p.ptr_); - + if (deep_copy != 0) { NameValuePair *tmp = deep_copy; @@ -238,7 +109,7 @@ DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var } } } - + return *this; } @@ -261,20 +132,20 @@ DynamicAny::NameValuePair_var::operator const ::DynamicAny::NameValuePair &() co } ACE_INLINE -DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() // cast +DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() // cast { return *this->ptr_; } ACE_INLINE -DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() const // cast +DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair *&() // cast +DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair *&() // cast { return this->ptr_; } @@ -291,7 +162,7 @@ DynamicAny::NameValuePair_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::DynamicAny::NameValuePair *& DynamicAny::NameValuePair_var::out (void) { @@ -352,7 +223,7 @@ DynamicAny::NameValuePair_out::operator= (NameValuePair *p) return *this; } -ACE_INLINE +ACE_INLINE DynamicAny::NameValuePair_out::operator ::DynamicAny::NameValuePair *&() // cast { return this->ptr_; @@ -376,176 +247,176 @@ DynamicAny::NameValuePair_out::operator-> (void) #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_) #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_ - // = Static operations. - ACE_INLINE DynamicAny::NameValuePair * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - DynamicAny::NameValuePair *retval = 0; - ACE_NEW_RETURN (retval, DynamicAny::NameValuePair[size], 0); - return retval; - } - - ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (DynamicAny::NameValuePair *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Default constructor. - { - } - - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (maximum)) - { - } +// = Static operations. +ACE_INLINE DynamicAny::NameValuePair * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + DynamicAny::NameValuePair *retval = 0; + ACE_NEW_RETURN (retval, DynamicAny::NameValuePair[size], 0); + return retval; +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum, - CORBA::ULong length, - DynamicAny::NameValuePair *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } +ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (DynamicAny::NameValuePair *buffer) +// Free the sequence. +{ + delete [] buffer; +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - DynamicAny::NameValuePair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->maximum_); - DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_); +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Default constructor. +{ +} - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (maximum)) +{ +} - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum, + CORBA::ULong length, + DynamicAny::NameValuePair *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} - ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs) - // Assignment operator. +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_); - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - DynamicAny::NameValuePair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_); + DynamicAny::NameValuePair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->maximum_); DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - - return *this; + + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE DynamicAny::NameValuePair & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - DynamicAny::NameValuePair* tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} - ACE_INLINE const DynamicAny::NameValuePair & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i) const - // operator [] +ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; + + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - DynamicAny::NameValuePair * const tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_); + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + DynamicAny::NameValuePair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_); + DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} - // Implement the TAO_Base_Sequence methods (see Sequence.h) +// = Accessors. +ACE_INLINE DynamicAny::NameValuePair & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + DynamicAny::NameValuePair* tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_); + return tmp[i]; +} - ACE_INLINE DynamicAny::NameValuePair * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (CORBA::Boolean orphan) +ACE_INLINE const DynamicAny::NameValuePair & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + DynamicAny::NameValuePair * const tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} + +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE DynamicAny::NameValuePair * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (CORBA::Boolean orphan) +{ + DynamicAny::NameValuePair *result = 0; + if (orphan == 0) { - DynamicAny::NameValuePair *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_); } - return result; } - - ACE_INLINE const DynamicAny::NameValuePair * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (void) const + else // if (orphan == 1) { - return ACE_reinterpret_cast(const DynamicAny::NameValuePair * ACE_CAST_CONST, this->buffer_); + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } } + return result; +} - ACE_INLINE void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::replace (CORBA::ULong max, - CORBA::ULong length, - DynamicAny::NameValuePair *data, - CORBA::Boolean release) +ACE_INLINE const DynamicAny::NameValuePair * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (void) const +{ + return ACE_reinterpret_cast(const DynamicAny::NameValuePair * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::replace (CORBA::ULong max, +CORBA::ULong length, +DynamicAny::NameValuePair *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_); - _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp); - } - this->buffer_ = data; - this->release_ = release; + DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_); + _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp); } + this->buffer_ = data; + this->release_ = release; +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_) #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CI_ @@ -601,7 +472,7 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe { NameValuePairSeq *deep_copy = new NameValuePairSeq (*p.ptr_); - + if (deep_copy != 0) { NameValuePairSeq *tmp = deep_copy; @@ -611,7 +482,7 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe } } } - + return *this; } @@ -627,27 +498,27 @@ DynamicAny::NameValuePairSeq_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE DynamicAny::NameValuePairSeq_var::operator const ::DynamicAny::NameValuePairSeq &() const // cast { return *this->ptr_; } -ACE_INLINE -DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() // cast +ACE_INLINE +DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() // cast { return *this->ptr_; } -ACE_INLINE -DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() const // cast +ACE_INLINE +DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq *&() // cast +DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq *&() // cast { return this->ptr_; } @@ -676,7 +547,7 @@ DynamicAny::NameValuePairSeq_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::DynamicAny::NameValuePairSeq *& DynamicAny::NameValuePairSeq_var::out (void) { @@ -737,7 +608,7 @@ DynamicAny::NameValuePairSeq_out::operator= (NameValuePairSeq *p) return *this; } -ACE_INLINE +ACE_INLINE DynamicAny::NameValuePairSeq_out::operator ::DynamicAny::NameValuePairSeq *&() // cast { return this->ptr_; @@ -815,7 +686,7 @@ DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_va { NameDynAnyPair *deep_copy = new NameDynAnyPair (*p.ptr_); - + if (deep_copy != 0) { NameDynAnyPair *tmp = deep_copy; @@ -825,7 +696,7 @@ DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_va } } } - + return *this; } @@ -848,20 +719,20 @@ DynamicAny::NameDynAnyPair_var::operator const ::DynamicAny::NameDynAnyPair &() } ACE_INLINE -DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() // cast +DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() // cast { return *this->ptr_; } ACE_INLINE -DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() const // cast +DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair *&() // cast +DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair *&() // cast { return this->ptr_; } @@ -878,7 +749,7 @@ DynamicAny::NameDynAnyPair_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::DynamicAny::NameDynAnyPair *& DynamicAny::NameDynAnyPair_var::out (void) { @@ -939,7 +810,7 @@ DynamicAny::NameDynAnyPair_out::operator= (NameDynAnyPair *p) return *this; } -ACE_INLINE +ACE_INLINE DynamicAny::NameDynAnyPair_out::operator ::DynamicAny::NameDynAnyPair *&() // cast { return this->ptr_; @@ -963,176 +834,176 @@ DynamicAny::NameDynAnyPair_out::operator-> (void) #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_) #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_ - // = Static operations. - ACE_INLINE DynamicAny::NameDynAnyPair * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - DynamicAny::NameDynAnyPair *retval = 0; - ACE_NEW_RETURN (retval, DynamicAny::NameDynAnyPair[size], 0); - return retval; - } - - ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (DynamicAny::NameDynAnyPair *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Default constructor. - { - } - - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (maximum)) - { - } +// = Static operations. +ACE_INLINE DynamicAny::NameDynAnyPair * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + DynamicAny::NameDynAnyPair *retval = 0; + ACE_NEW_RETURN (retval, DynamicAny::NameDynAnyPair[size], 0); + return retval; +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum, - CORBA::ULong length, - DynamicAny::NameDynAnyPair *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } +ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (DynamicAny::NameDynAnyPair *buffer) +// Free the sequence. +{ + delete [] buffer; +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - DynamicAny::NameDynAnyPair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->maximum_); - DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_); +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Default constructor. +{ +} - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (maximum)) +{ +} - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum, + CORBA::ULong length, + DynamicAny::NameDynAnyPair *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} - ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs) - // Assignment operator. +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_); - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - DynamicAny::NameDynAnyPair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_); + DynamicAny::NameDynAnyPair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->maximum_); DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - - return *this; + + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE DynamicAny::NameDynAnyPair & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - DynamicAny::NameDynAnyPair* tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} - ACE_INLINE const DynamicAny::NameDynAnyPair & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i) const - // operator [] +ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; + + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - DynamicAny::NameDynAnyPair * const tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_); + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + DynamicAny::NameDynAnyPair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_); + DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} - // Implement the TAO_Base_Sequence methods (see Sequence.h) +// = Accessors. +ACE_INLINE DynamicAny::NameDynAnyPair & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + DynamicAny::NameDynAnyPair* tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_); + return tmp[i]; +} + +ACE_INLINE const DynamicAny::NameDynAnyPair & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + DynamicAny::NameDynAnyPair * const tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} - ACE_INLINE DynamicAny::NameDynAnyPair * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (CORBA::Boolean orphan) +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE DynamicAny::NameDynAnyPair * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (CORBA::Boolean orphan) +{ + DynamicAny::NameDynAnyPair *result = 0; + if (orphan == 0) { - DynamicAny::NameDynAnyPair *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_); } - return result; } - - ACE_INLINE const DynamicAny::NameDynAnyPair * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (void) const + else // if (orphan == 1) { - return ACE_reinterpret_cast(const DynamicAny::NameDynAnyPair * ACE_CAST_CONST, this->buffer_); + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } } + return result; +} - ACE_INLINE void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::replace (CORBA::ULong max, - CORBA::ULong length, - DynamicAny::NameDynAnyPair *data, - CORBA::Boolean release) +ACE_INLINE const DynamicAny::NameDynAnyPair * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (void) const +{ + return ACE_reinterpret_cast(const DynamicAny::NameDynAnyPair * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::replace (CORBA::ULong max, +CORBA::ULong length, +DynamicAny::NameDynAnyPair *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_); - _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp); - } - this->buffer_ = data; - this->release_ = release; + DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_); + _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp); } + this->buffer_ = data; + this->release_ = release; +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_) #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_ @@ -1188,7 +1059,7 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair { NameDynAnyPairSeq *deep_copy = new NameDynAnyPairSeq (*p.ptr_); - + if (deep_copy != 0) { NameDynAnyPairSeq *tmp = deep_copy; @@ -1198,7 +1069,7 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair } } } - + return *this; } @@ -1214,27 +1085,27 @@ DynamicAny::NameDynAnyPairSeq_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE DynamicAny::NameDynAnyPairSeq_var::operator const ::DynamicAny::NameDynAnyPairSeq &() const // cast { return *this->ptr_; } -ACE_INLINE -DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() // cast +ACE_INLINE +DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() // cast { return *this->ptr_; } -ACE_INLINE -DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() const // cast +ACE_INLINE +DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast +DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast { return this->ptr_; } @@ -1263,7 +1134,7 @@ DynamicAny::NameDynAnyPairSeq_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *& DynamicAny::NameDynAnyPairSeq_var::out (void) { @@ -1324,7 +1195,7 @@ DynamicAny::NameDynAnyPairSeq_out::operator= (NameDynAnyPairSeq *p) return *this; } -ACE_INLINE +ACE_INLINE DynamicAny::NameDynAnyPairSeq_out::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast { return this->ptr_; @@ -1355,278 +1226,192 @@ DynamicAny::NameDynAnyPairSeq_out::operator[] (CORBA::ULong index) #if !defined (_DYNAMICANY_DYNSTRUCT___CI_) #define _DYNAMICANY_DYNSTRUCT___CI_ -ACE_INLINE DynamicAny::DynStruct_ptr -tao_DynamicAny_DynStruct_duplicate ( - DynamicAny::DynStruct_ptr p - ) -{ - return DynamicAny::DynStruct::_duplicate (p); -} - -ACE_INLINE void -tao_DynamicAny_DynStruct_release ( - DynamicAny::DynStruct_ptr p - ) -{ - CORBA::release (p); -} -ACE_INLINE DynamicAny::DynStruct_ptr -tao_DynamicAny_DynStruct_nil ( - void - ) -{ - return DynamicAny::DynStruct::_nil (); -} +#endif /* end #if !defined */ -ACE_INLINE DynamicAny::DynStruct_ptr -tao_DynamicAny_DynStruct_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return DynamicAny::DynStruct::_narrow (p ACE_ENV_ARG_PARAMETER); -} -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynStruct_upcast ( - void *src - ) -{ - DynamicAny::DynStruct **tmp = - ACE_static_cast (DynamicAny::DynStruct **, src); - return *tmp; -} +#if !defined (_DYNAMICANY_DYNUNION___CI_) +#define _DYNAMICANY_DYNUNION___CI_ #endif /* end #if !defined */ -#if !defined (_DYNAMICANY_DYNUNION___CI_) -#define _DYNAMICANY_DYNUNION___CI_ +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -ACE_INLINE DynamicAny::DynUnion_ptr -tao_DynamicAny_DynUnion_duplicate ( - DynamicAny::DynUnion_ptr p - ) +#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_) +#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_ + +// = Static operations. +ACE_INLINE CORBA::Any * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. { - return DynamicAny::DynUnion::_duplicate (p); + CORBA::Any *retval = 0; + ACE_NEW_RETURN (retval, CORBA::Any[size], 0); + return retval; } -ACE_INLINE void -tao_DynamicAny_DynUnion_release ( - DynamicAny::DynUnion_ptr p - ) +ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (CORBA::Any *buffer) +// Free the sequence. { - CORBA::release (p); + delete [] buffer; } -ACE_INLINE DynamicAny::DynUnion_ptr -tao_DynamicAny_DynUnion_nil ( - void - ) +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Default constructor. { - return DynamicAny::DynUnion::_nil (); } -ACE_INLINE DynamicAny::DynUnion_ptr -tao_DynamicAny_DynUnion_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (maximum)) { - return DynamicAny::DynUnion::_narrow (p ACE_ENV_ARG_PARAMETER); } -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynUnion_upcast ( - void *src - ) +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum, + CORBA::ULong length, + CORBA::Any *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) { - DynamicAny::DynUnion **tmp = - ACE_static_cast (DynamicAny::DynUnion **, src); - return *tmp; } - -#endif /* end #if !defined */ - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_ - - // = Static operations. - ACE_INLINE CORBA::Any * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. +ACE_INLINE +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - CORBA::Any *retval = 0; - ACE_NEW_RETURN (retval, CORBA::Any[size], 0); - return retval; + CORBA::Any *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->maximum_); + CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + this->buffer_ = tmp1; } - - ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (CORBA::Any *buffer) - // Free the sequence. + else { - delete [] buffer; + this->buffer_ = 0; } +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Default constructor. +ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; + + if (this->release_) { + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *, this->buffer_); + _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + CORBA::Any *tmp1 = ACE_reinterpret_cast (CORBA::Any *, this->buffer_); + CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (maximum)) - { - } +// = Accessors. +ACE_INLINE CORBA::Any & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + CORBA::Any* tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_); + return tmp[i]; +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum, - CORBA::ULong length, - CORBA::Any *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } +ACE_INLINE const CORBA::Any & +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + CORBA::Any * const tmp = ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE CORBA::Any * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (CORBA::Boolean orphan) +{ + CORBA::Any *result = 0; + if (orphan == 0) { - if (rhs.buffer_ != 0) + // We retain ownership. + if (this->buffer_ == 0) { - CORBA::Any *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->maximum_); - CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; + result = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } else { - this->buffer_ = 0; - } - } - - ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs) - // Assignment operator. - { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *, this->buffer_); - _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_); - } + result = ACE_reinterpret_cast (CORBA::Any*, this->buffer_); } - else - this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::Any *tmp1 = ACE_reinterpret_cast (CORBA::Any *, this->buffer_); - CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - return *this; - } - - // = Accessors. - ACE_INLINE CORBA::Any & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i) - // operator [] - { - ACE_ASSERT (i < this->maximum_); - CORBA::Any* tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_); - return tmp[i]; - } - - ACE_INLINE const CORBA::Any & - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i) const - // operator [] - { - ACE_ASSERT (i < this->maximum_); - CORBA::Any * const tmp = ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_); - return tmp[i]; } - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - ACE_INLINE CORBA::Any * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (CORBA::Boolean orphan) + else // if (orphan == 1) { - CORBA::Any *result = 0; - if (orphan == 0) + if (this->release_ != 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (CORBA::Any*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(CORBA::Any*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(CORBA::Any*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; } - return result; } + return result; +} - ACE_INLINE const CORBA::Any * - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (void) const - { - return ACE_reinterpret_cast(const CORBA::Any * ACE_CAST_CONST, this->buffer_); - } +ACE_INLINE const CORBA::Any * +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (void) const +{ + return ACE_reinterpret_cast(const CORBA::Any * ACE_CAST_CONST, this->buffer_); +} - ACE_INLINE void - DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::replace (CORBA::ULong max, - CORBA::ULong length, - CORBA::Any *data, - CORBA::Boolean release) +ACE_INLINE void +DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::replace (CORBA::ULong max, +CORBA::ULong length, +CORBA::Any *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - CORBA::Any *tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_); - _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp); - } - this->buffer_ = data; - this->release_ = release; + CORBA::Any *tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_); + _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp); } + this->buffer_ = data; + this->release_ = release; +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_DYNAMICANY_ANYSEQ_CI_) #define _DYNAMICANY_ANYSEQ_CI_ @@ -1682,7 +1467,7 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p) { AnySeq *deep_copy = new AnySeq (*p.ptr_); - + if (deep_copy != 0) { AnySeq *tmp = deep_copy; @@ -1692,7 +1477,7 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p) } } } - + return *this; } @@ -1708,27 +1493,27 @@ DynamicAny::AnySeq_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE DynamicAny::AnySeq_var::operator const ::DynamicAny::AnySeq &() const // cast { return *this->ptr_; } -ACE_INLINE -DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() // cast +ACE_INLINE +DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() // cast { return *this->ptr_; } -ACE_INLINE -DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() const // cast +ACE_INLINE +DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq *&() // cast +DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq *&() // cast { return this->ptr_; } @@ -1757,7 +1542,7 @@ DynamicAny::AnySeq_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::DynamicAny::AnySeq *& DynamicAny::AnySeq_var::out (void) { @@ -1818,7 +1603,7 @@ DynamicAny::AnySeq_out::operator= (AnySeq *p) return *this; } -ACE_INLINE +ACE_INLINE DynamicAny::AnySeq_out::operator ::DynamicAny::AnySeq *&() // cast { return this->ptr_; @@ -1851,162 +1636,162 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index) #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_ - ACE_INLINE DynamicAny::DynAny ** - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (CORBA::ULong nelems) - { - DynamicAny::DynAny **buf = 0; - - ACE_NEW_RETURN (buf, DynamicAny::DynAny*[nelems], 0); +ACE_INLINE DynamicAny::DynAny ** +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (CORBA::ULong nelems) +{ + DynamicAny::DynAny **buf = 0; + + ACE_NEW_RETURN (buf, DynamicAny::DynAny*[nelems], 0); + + for (CORBA::ULong i = 0; i < nelems; i++) + { + buf[i] = DynamicAny::DynAny::_nil (); + } + + return buf; +} - for (CORBA::ULong i = 0; i < nelems; i++) - { - buf[i] = DynamicAny::DynAny::_nil (); - } +ACE_INLINE void +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (DynamicAny::DynAny **buffer) +{ + if (buffer == 0) + return; + delete[] buffer; +} - return buf; - } +ACE_INLINE +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void) +{ +} - ACE_INLINE void - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (DynamicAny::DynAny **buffer) - { - if (buffer == 0) - return; - delete[] buffer; - } +ACE_INLINE +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum) + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (maximum)) +{ +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void) - { - } +ACE_INLINE +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum, + CORBA::ULong length, + DynamicAny::DynAny* *value, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, value, release) +{ +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (maximum)) +ACE_INLINE +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs) + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { + DynamicAny::DynAny **tmp1 = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_); + DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < rhs.length_; ++i) + { + tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]); + } + + this->buffer_ = tmp1; } - - ACE_INLINE - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum, - CORBA::ULong length, - DynamicAny::DynAny* *value, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, value, release) + else { + this->buffer_ = 0; } +} - ACE_INLINE - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs) - : TAO_Unbounded_Base_Sequence (rhs) +ACE_INLINE DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq & +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs) +{ + if (this == &rhs) + return *this; + + if (this->release_) { - if (rhs.buffer_ != 0) + DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) { - DynamicAny::DynAny **tmp1 = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_); - DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]); - } - - this->buffer_ = tmp1; + CORBA::release (tmp[i]); + tmp[i] = DynamicAny::DynAny::_nil (); } - else + if (this->maximum_ < rhs.maximum_) { - this->buffer_ = 0; + _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_); } } - - ACE_INLINE DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq & - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs) - { - if (this == &rhs) - return *this; - - if (this->release_) + else + this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + DynamicAny::DynAny **tmp1 = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_); + DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - CORBA::release (tmp[i]); - tmp[i] = DynamicAny::DynAny::_nil (); - } - if (this->maximum_ < rhs.maximum_) - { - _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_); - } + tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]); } - else - this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - DynamicAny::DynAny **tmp1 = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_); - DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]); - } - - return *this; - } + + return *this; +} - ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator[] (CORBA::ULong index) const - // read-write accessor - { - ACE_ASSERT (index < this->maximum_); - DynamicAny::DynAny ** const tmp = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_); - return TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> (tmp + index, this->release_); - } +ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator[] (CORBA::ULong index) const +// read-write accessor +{ + ACE_ASSERT (index < this->maximum_); + DynamicAny::DynAny ** const tmp = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_); + return TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> (tmp + index, this->release_); +} - ACE_INLINE DynamicAny::DynAny* * - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (CORBA::Boolean orphan) +ACE_INLINE DynamicAny::DynAny* * +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (CORBA::Boolean orphan) +{ + DynamicAny::DynAny **result = 0; + if (orphan == 0) { - DynamicAny::DynAny **result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_); - } + result = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(DynamicAny::DynAny**,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_); } - return result; } - - ACE_INLINE const DynamicAny::DynAny* * - DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (void) const + else // if (orphan == 1) { - return ACE_reinterpret_cast(const DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_); + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(DynamicAny::DynAny**,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } } + return result; +} + +ACE_INLINE const DynamicAny::DynAny* * +DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (void) const +{ + return ACE_reinterpret_cast(const DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_DYNAMICANY_DYNANYSEQ_CI_) #define _DYNAMICANY_DYNANYSEQ_CI_ @@ -2062,7 +1847,7 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p) { DynAnySeq *deep_copy = new DynAnySeq (*p.ptr_); - + if (deep_copy != 0) { DynAnySeq *tmp = deep_copy; @@ -2072,7 +1857,7 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p) } } } - + return *this; } @@ -2088,27 +1873,27 @@ DynamicAny::DynAnySeq_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE DynamicAny::DynAnySeq_var::operator const ::DynamicAny::DynAnySeq &() const // cast { return *this->ptr_; } -ACE_INLINE -DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() // cast +ACE_INLINE +DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() // cast { return *this->ptr_; } -ACE_INLINE -DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() const // cast +ACE_INLINE +DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq *&() // cast +DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq *&() // cast { return this->ptr_; } @@ -2131,7 +1916,7 @@ DynamicAny::DynAnySeq_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::DynamicAny::DynAnySeq *& DynamicAny::DynAnySeq_var::out (void) { @@ -2192,7 +1977,7 @@ DynamicAny::DynAnySeq_out::operator= (DynAnySeq *p) return *this; } -ACE_INLINE +ACE_INLINE DynamicAny::DynAnySeq_out::operator ::DynamicAny::DynAnySeq *&() // cast { return this->ptr_; @@ -2223,49 +2008,6 @@ DynamicAny::DynAnySeq_out::operator[] (CORBA::ULong index) #if !defined (_DYNAMICANY_DYNSEQUENCE___CI_) #define _DYNAMICANY_DYNSEQUENCE___CI_ -ACE_INLINE DynamicAny::DynSequence_ptr -tao_DynamicAny_DynSequence_duplicate ( - DynamicAny::DynSequence_ptr p - ) -{ - return DynamicAny::DynSequence::_duplicate (p); -} - -ACE_INLINE void -tao_DynamicAny_DynSequence_release ( - DynamicAny::DynSequence_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE DynamicAny::DynSequence_ptr -tao_DynamicAny_DynSequence_nil ( - void - ) -{ - return DynamicAny::DynSequence::_nil (); -} - -ACE_INLINE DynamicAny::DynSequence_ptr -tao_DynamicAny_DynSequence_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynSequence_upcast ( - void *src - ) -{ - DynamicAny::DynSequence **tmp = - ACE_static_cast (DynamicAny::DynSequence **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -2273,49 +2015,6 @@ tao_DynamicAny_DynSequence_upcast ( #if !defined (_DYNAMICANY_DYNARRAY___CI_) #define _DYNAMICANY_DYNARRAY___CI_ -ACE_INLINE DynamicAny::DynArray_ptr -tao_DynamicAny_DynArray_duplicate ( - DynamicAny::DynArray_ptr p - ) -{ - return DynamicAny::DynArray::_duplicate (p); -} - -ACE_INLINE void -tao_DynamicAny_DynArray_release ( - DynamicAny::DynArray_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE DynamicAny::DynArray_ptr -tao_DynamicAny_DynArray_nil ( - void - ) -{ - return DynamicAny::DynArray::_nil (); -} - -ACE_INLINE DynamicAny::DynArray_ptr -tao_DynamicAny_DynArray_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynArray_upcast ( - void *src - ) -{ - DynamicAny::DynArray **tmp = - ACE_static_cast (DynamicAny::DynArray **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -2323,49 +2022,6 @@ tao_DynamicAny_DynArray_upcast ( #if !defined (_DYNAMICANY_DYNVALUE___CI_) #define _DYNAMICANY_DYNVALUE___CI_ -ACE_INLINE DynamicAny::DynValue_ptr -tao_DynamicAny_DynValue_duplicate ( - DynamicAny::DynValue_ptr p - ) -{ - return DynamicAny::DynValue::_duplicate (p); -} - -ACE_INLINE void -tao_DynamicAny_DynValue_release ( - DynamicAny::DynValue_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE DynamicAny::DynValue_ptr -tao_DynamicAny_DynValue_nil ( - void - ) -{ - return DynamicAny::DynValue::_nil (); -} - -ACE_INLINE DynamicAny::DynValue_ptr -tao_DynamicAny_DynValue_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynValue_upcast ( - void *src - ) -{ - DynamicAny::DynValue **tmp = - ACE_static_cast (DynamicAny::DynValue **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -2377,49 +2033,6 @@ tao_DynamicAny_DynValue_upcast ( #if !defined (_DYNAMICANY_DYNANYFACTORY___CI_) #define _DYNAMICANY_DYNANYFACTORY___CI_ -ACE_INLINE DynamicAny::DynAnyFactory_ptr -tao_DynamicAny_DynAnyFactory_duplicate ( - DynamicAny::DynAnyFactory_ptr p - ) -{ - return DynamicAny::DynAnyFactory::_duplicate (p); -} - -ACE_INLINE void -tao_DynamicAny_DynAnyFactory_release ( - DynamicAny::DynAnyFactory_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE DynamicAny::DynAnyFactory_ptr -tao_DynamicAny_DynAnyFactory_nil ( - void - ) -{ - return DynamicAny::DynAnyFactory::_nil (); -} - -ACE_INLINE DynamicAny::DynAnyFactory_ptr -tao_DynamicAny_DynAnyFactory_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_DynamicAny_DynAnyFactory_upcast ( - void *src - ) -{ - DynamicAny::DynAnyFactory **tmp = - ACE_static_cast (DynamicAny::DynAnyFactory **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -2432,7 +2045,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const DynamicAny::Nam return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, DynamicAny::NameValuePair &_tao_aggregate) @@ -2444,7 +2057,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, DynamicAny::NameValueP return 1; else return 0; - + } diff --git a/TAO/tao/DynamicAny/diffs/DynamicAny.diff b/TAO/tao/DynamicAny/diffs/DynamicAny.diff new file mode 100644 index 00000000000..232c87b148f --- /dev/null +++ b/TAO/tao/DynamicAny/diffs/DynamicAny.diff @@ -0,0 +1,60 @@ +--- orig/DynamicAnyC.h Wed Feb 6 11:11:22 2002 ++++ DynamicAnyC.h Wed Feb 6 11:17:29 2002 +@@ -22,6 +22,10 @@ + #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_ + #define _TAO_IDL_ORIG_DYNAMICANYC_H_ + ++#ifndef TAO_DYNAMICANY_SAFE_INCLUDE ++#error "You should not include DynamicAnyC.h directly, use DynamicAny.h" ++#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */ ++ + #include "ace/pre.h" + #include "tao/corba.h" + +@@ -1650,7 +1654,7 @@ + , DynamicAny::DynAny::InvalidValue + )) = 0; + +- virtual ::TCKind current_member_kind ( ++ virtual CORBA::TCKind current_member_kind ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) +@@ -1868,7 +1872,7 @@ + CORBA::SystemException + )) = 0; + +- virtual ::TCKind discriminator_kind ( ++ virtual CORBA::TCKind discriminator_kind ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) +@@ -1894,7 +1898,7 @@ + , DynamicAny::DynAny::InvalidValue + )) = 0; + +- virtual ::TCKind member_kind ( ++ virtual CORBA::TCKind member_kind ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) +@@ -2716,7 +2720,7 @@ + , DynamicAny::DynAny::InvalidValue + )) = 0; + +- virtual ::TCKind current_member_kind ( ++ virtual CORBA::TCKind current_member_kind ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) +--- orig/DynamicAnyC.cpp Wed Feb 6 11:11:22 2002 ++++ DynamicAnyC.cpp Wed Feb 6 11:15:25 2002 +@@ -19,7 +19,7 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#include "DynamicAnyC.h" ++#include "DynamicAny.h" + + #include "tao/Stub.h" + #include "tao/Invocation.h" diff --git a/TAO/tao/DynamicAny/diffs/DynamicAnyC.cpp.diff b/TAO/tao/DynamicAny/diffs/DynamicAnyC.cpp.diff deleted file mode 100644 index e156b21a4a0..00000000000 --- a/TAO/tao/DynamicAny/diffs/DynamicAnyC.cpp.diff +++ /dev/null @@ -1,500 +0,0 @@ ---- orig/DynamicAnyC.cpp Wed Apr 25 00:31:12 2001 -+++ DynamicAnyC.cpp Tue Apr 24 13:44:43 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -19,14 +19,7 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#include "DynamicAnyC.h" -- --#include "tao/Stub.h" --#include "tao/Invocation.h" --#include "tao/ClientRequestInfo.h" --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -+#include "DynamicAny.h" - - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus -@@ -36,49 +29,6 @@ - #include "DynamicAnyC.i" - #endif /* !defined INLINE */ - --DynamicAny::DynAny_ptr --tao_DynamicAny_DynAny_duplicate ( -- DynamicAny::DynAny_ptr p -- ) --{ -- return DynamicAny::DynAny::_duplicate (p); --} -- --void --tao_DynamicAny_DynAny_release ( -- DynamicAny::DynAny_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynAny_ptr --tao_DynamicAny_DynAny_nil ( -- void -- ) --{ -- return DynamicAny::DynAny::_nil (); --} -- --DynamicAny::DynAny_ptr --tao_DynamicAny_DynAny_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynAny::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynAny_upcast ( -- void *src -- ) --{ -- DynamicAny::DynAny **tmp = -- ACE_static_cast (DynamicAny::DynAny **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynAny_var - // ************************************************************* -@@ -466,49 +416,6 @@ - return retval; - } - --DynamicAny::DynFixed_ptr --tao_DynamicAny_DynFixed_duplicate ( -- DynamicAny::DynFixed_ptr p -- ) --{ -- return DynamicAny::DynFixed::_duplicate (p); --} -- --void --tao_DynamicAny_DynFixed_release ( -- DynamicAny::DynFixed_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynFixed_ptr --tao_DynamicAny_DynFixed_nil ( -- void -- ) --{ -- return DynamicAny::DynFixed::_nil (); --} -- --DynamicAny::DynFixed_ptr --tao_DynamicAny_DynFixed_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynFixed::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynFixed_upcast ( -- void *src -- ) --{ -- DynamicAny::DynFixed **tmp = -- ACE_static_cast (DynamicAny::DynFixed **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynFixed_var - // ************************************************************* -@@ -772,49 +679,6 @@ - return "IDL:DynamicAny/DynFixed:1.0"; - } - --DynamicAny::DynEnum_ptr --tao_DynamicAny_DynEnum_duplicate ( -- DynamicAny::DynEnum_ptr p -- ) --{ -- return DynamicAny::DynEnum::_duplicate (p); --} -- --void --tao_DynamicAny_DynEnum_release ( -- DynamicAny::DynEnum_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynEnum_ptr --tao_DynamicAny_DynEnum_nil ( -- void -- ) --{ -- return DynamicAny::DynEnum::_nil (); --} -- --DynamicAny::DynEnum_ptr --tao_DynamicAny_DynEnum_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynEnum::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynEnum_upcast ( -- void *src -- ) --{ -- DynamicAny::DynEnum **tmp = -- ACE_static_cast (DynamicAny::DynEnum **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynEnum_var - // ************************************************************* -@@ -1454,49 +1318,6 @@ - - #endif /* end #if !defined */ - --DynamicAny::DynStruct_ptr --tao_DynamicAny_DynStruct_duplicate ( -- DynamicAny::DynStruct_ptr p -- ) --{ -- return DynamicAny::DynStruct::_duplicate (p); --} -- --void --tao_DynamicAny_DynStruct_release ( -- DynamicAny::DynStruct_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynStruct_ptr --tao_DynamicAny_DynStruct_nil ( -- void -- ) --{ -- return DynamicAny::DynStruct::_nil (); --} -- --DynamicAny::DynStruct_ptr --tao_DynamicAny_DynStruct_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynStruct::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynStruct_upcast ( -- void *src -- ) --{ -- DynamicAny::DynStruct **tmp = -- ACE_static_cast (DynamicAny::DynStruct **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynStruct_var - // ************************************************************* -@@ -1760,49 +1581,6 @@ - return "IDL:DynamicAny/DynStruct:1.0"; - } - --DynamicAny::DynUnion_ptr --tao_DynamicAny_DynUnion_duplicate ( -- DynamicAny::DynUnion_ptr p -- ) --{ -- return DynamicAny::DynUnion::_duplicate (p); --} -- --void --tao_DynamicAny_DynUnion_release ( -- DynamicAny::DynUnion_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynUnion_ptr --tao_DynamicAny_DynUnion_nil ( -- void -- ) --{ -- return DynamicAny::DynUnion::_nil (); --} -- --DynamicAny::DynUnion_ptr --tao_DynamicAny_DynUnion_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynUnion::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynUnion_upcast ( -- void *src -- ) --{ -- DynamicAny::DynUnion **tmp = -- ACE_static_cast (DynamicAny::DynUnion **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynUnion_var - // ************************************************************* -@@ -2339,49 +2117,6 @@ - - #endif /* end #if !defined */ - --DynamicAny::DynSequence_ptr --tao_DynamicAny_DynSequence_duplicate ( -- DynamicAny::DynSequence_ptr p -- ) --{ -- return DynamicAny::DynSequence::_duplicate (p); --} -- --void --tao_DynamicAny_DynSequence_release ( -- DynamicAny::DynSequence_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynSequence_ptr --tao_DynamicAny_DynSequence_nil ( -- void -- ) --{ -- return DynamicAny::DynSequence::_nil (); --} -- --DynamicAny::DynSequence_ptr --tao_DynamicAny_DynSequence_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynSequence::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynSequence_upcast ( -- void *src -- ) --{ -- DynamicAny::DynSequence **tmp = -- ACE_static_cast (DynamicAny::DynSequence **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynSequence_var - // ************************************************************* -@@ -2645,49 +2380,6 @@ - return "IDL:DynamicAny/DynSequence:1.0"; - } - --DynamicAny::DynArray_ptr --tao_DynamicAny_DynArray_duplicate ( -- DynamicAny::DynArray_ptr p -- ) --{ -- return DynamicAny::DynArray::_duplicate (p); --} -- --void --tao_DynamicAny_DynArray_release ( -- DynamicAny::DynArray_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynArray_ptr --tao_DynamicAny_DynArray_nil ( -- void -- ) --{ -- return DynamicAny::DynArray::_nil (); --} -- --DynamicAny::DynArray_ptr --tao_DynamicAny_DynArray_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynArray::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynArray_upcast ( -- void *src -- ) --{ -- DynamicAny::DynArray **tmp = -- ACE_static_cast (DynamicAny::DynArray **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynArray_var - // ************************************************************* -@@ -2951,49 +2643,6 @@ - return "IDL:DynamicAny/DynArray:1.0"; - } - --DynamicAny::DynValue_ptr --tao_DynamicAny_DynValue_duplicate ( -- DynamicAny::DynValue_ptr p -- ) --{ -- return DynamicAny::DynValue::_duplicate (p); --} -- --void --tao_DynamicAny_DynValue_release ( -- DynamicAny::DynValue_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynValue_ptr --tao_DynamicAny_DynValue_nil ( -- void -- ) --{ -- return DynamicAny::DynValue::_nil (); --} -- --DynamicAny::DynValue_ptr --tao_DynamicAny_DynValue_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynValue::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynValue_upcast ( -- void *src -- ) --{ -- DynamicAny::DynValue **tmp = -- ACE_static_cast (DynamicAny::DynValue **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynValue_var - // ************************************************************* -@@ -3257,49 +2906,6 @@ - return "IDL:DynamicAny/DynValue:1.0"; - } - --DynamicAny::DynAnyFactory_ptr --tao_DynamicAny_DynAnyFactory_duplicate ( -- DynamicAny::DynAnyFactory_ptr p -- ) --{ -- return DynamicAny::DynAnyFactory::_duplicate (p); --} -- --void --tao_DynamicAny_DynAnyFactory_release ( -- DynamicAny::DynAnyFactory_ptr p -- ) --{ -- CORBA::release (p); --} -- --DynamicAny::DynAnyFactory_ptr --tao_DynamicAny_DynAnyFactory_nil ( -- void -- ) --{ -- return DynamicAny::DynAnyFactory::_nil (); --} -- --DynamicAny::DynAnyFactory_ptr --tao_DynamicAny_DynAnyFactory_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return DynamicAny::DynAnyFactory::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_DynamicAny_DynAnyFactory_upcast ( -- void *src -- ) --{ -- DynamicAny::DynAnyFactory **tmp = -- ACE_static_cast (DynamicAny::DynAnyFactory **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class DynamicAny::DynAnyFactory_var - // ************************************************************* -@@ -3978,11 +3584,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -4025,11 +3626,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) diff --git a/TAO/tao/DynamicAny/diffs/DynamicAnyC.h.diff b/TAO/tao/DynamicAny/diffs/DynamicAnyC.h.diff deleted file mode 100644 index 140fb1d4ae5..00000000000 --- a/TAO/tao/DynamicAny/diffs/DynamicAnyC.h.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- orig/DynamicAnyC.h Wed Apr 25 00:31:12 2001 -+++ DynamicAnyC.h Tue Apr 24 13:44:43 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -21,6 +21,10 @@ - - #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_ - #define _TAO_IDL_ORIG_DYNAMICANYC_H_ -+ -+#ifndef TAO_DYNAMICANY_SAFE_INCLUDE -+#error "You should not include DynamicAnyC.h directly, use DynamicAny.h" -+#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */ - - #include "ace/pre.h" - #include "tao/corba.h" diff --git a/TAO/tao/DynamicAny/diffs/DynamicAnyC.i.diff b/TAO/tao/DynamicAny/diffs/DynamicAnyC.i.diff deleted file mode 100644 index 4eb6950a3cd..00000000000 --- a/TAO/tao/DynamicAny/diffs/DynamicAnyC.i.diff +++ /dev/null @@ -1,460 +0,0 @@ ---- orig/DynamicAnyC.i Wed Apr 25 00:31:12 2001 -+++ DynamicAnyC.i Tue Apr 24 13:44:43 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -31,6 +31,49 @@ - #if !defined (_DYNAMICANY_DYNANY___CI_) - #define _DYNAMICANY_DYNANY___CI_ - -+ACE_INLINE DynamicAny::DynAny_ptr -+tao_DynamicAny_DynAny_duplicate ( -+ DynamicAny::DynAny_ptr p -+ ) -+{ -+ return DynamicAny::DynAny::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynAny_release ( -+ DynamicAny::DynAny_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynAny_ptr -+tao_DynamicAny_DynAny_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynAny::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynAny_ptr -+tao_DynamicAny_DynAny_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynAny::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynAny_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynAny **tmp = -+ ACE_static_cast (DynamicAny::DynAny **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -38,6 +81,49 @@ - #if !defined (_DYNAMICANY_DYNFIXED___CI_) - #define _DYNAMICANY_DYNFIXED___CI_ - -+ACE_INLINE DynamicAny::DynFixed_ptr -+tao_DynamicAny_DynFixed_duplicate ( -+ DynamicAny::DynFixed_ptr p -+ ) -+{ -+ return DynamicAny::DynFixed::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynFixed_release ( -+ DynamicAny::DynFixed_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynFixed_ptr -+tao_DynamicAny_DynFixed_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynFixed::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynFixed_ptr -+tao_DynamicAny_DynFixed_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynFixed::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynFixed_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynFixed **tmp = -+ ACE_static_cast (DynamicAny::DynFixed **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -45,6 +131,49 @@ - #if !defined (_DYNAMICANY_DYNENUM___CI_) - #define _DYNAMICANY_DYNENUM___CI_ - -+ACE_INLINE DynamicAny::DynEnum_ptr -+tao_DynamicAny_DynEnum_duplicate ( -+ DynamicAny::DynEnum_ptr p -+ ) -+{ -+ return DynamicAny::DynEnum::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynEnum_release ( -+ DynamicAny::DynEnum_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynEnum_ptr -+tao_DynamicAny_DynEnum_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynEnum::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynEnum_ptr -+tao_DynamicAny_DynEnum_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynEnum::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynEnum_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynEnum **tmp = -+ ACE_static_cast (DynamicAny::DynEnum **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1226,6 +1355,49 @@ - #if !defined (_DYNAMICANY_DYNSTRUCT___CI_) - #define _DYNAMICANY_DYNSTRUCT___CI_ - -+ACE_INLINE DynamicAny::DynStruct_ptr -+tao_DynamicAny_DynStruct_duplicate ( -+ DynamicAny::DynStruct_ptr p -+ ) -+{ -+ return DynamicAny::DynStruct::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynStruct_release ( -+ DynamicAny::DynStruct_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynStruct_ptr -+tao_DynamicAny_DynStruct_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynStruct::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynStruct_ptr -+tao_DynamicAny_DynStruct_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynStruct::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynStruct_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynStruct **tmp = -+ ACE_static_cast (DynamicAny::DynStruct **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1233,6 +1405,49 @@ - #if !defined (_DYNAMICANY_DYNUNION___CI_) - #define _DYNAMICANY_DYNUNION___CI_ - -+ACE_INLINE DynamicAny::DynUnion_ptr -+tao_DynamicAny_DynUnion_duplicate ( -+ DynamicAny::DynUnion_ptr p -+ ) -+{ -+ return DynamicAny::DynUnion::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynUnion_release ( -+ DynamicAny::DynUnion_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynUnion_ptr -+tao_DynamicAny_DynUnion_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynUnion::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynUnion_ptr -+tao_DynamicAny_DynUnion_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynUnion::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynUnion_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynUnion **tmp = -+ ACE_static_cast (DynamicAny::DynUnion **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -2008,6 +2223,49 @@ - #if !defined (_DYNAMICANY_DYNSEQUENCE___CI_) - #define _DYNAMICANY_DYNSEQUENCE___CI_ - -+ACE_INLINE DynamicAny::DynSequence_ptr -+tao_DynamicAny_DynSequence_duplicate ( -+ DynamicAny::DynSequence_ptr p -+ ) -+{ -+ return DynamicAny::DynSequence::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynSequence_release ( -+ DynamicAny::DynSequence_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynSequence_ptr -+tao_DynamicAny_DynSequence_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynSequence::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynSequence_ptr -+tao_DynamicAny_DynSequence_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynSequence::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynSequence_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynSequence **tmp = -+ ACE_static_cast (DynamicAny::DynSequence **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -2015,6 +2273,49 @@ - #if !defined (_DYNAMICANY_DYNARRAY___CI_) - #define _DYNAMICANY_DYNARRAY___CI_ - -+ACE_INLINE DynamicAny::DynArray_ptr -+tao_DynamicAny_DynArray_duplicate ( -+ DynamicAny::DynArray_ptr p -+ ) -+{ -+ return DynamicAny::DynArray::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynArray_release ( -+ DynamicAny::DynArray_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynArray_ptr -+tao_DynamicAny_DynArray_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynArray::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynArray_ptr -+tao_DynamicAny_DynArray_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynArray::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynArray_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynArray **tmp = -+ ACE_static_cast (DynamicAny::DynArray **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -2022,6 +2323,49 @@ - #if !defined (_DYNAMICANY_DYNVALUE___CI_) - #define _DYNAMICANY_DYNVALUE___CI_ - -+ACE_INLINE DynamicAny::DynValue_ptr -+tao_DynamicAny_DynValue_duplicate ( -+ DynamicAny::DynValue_ptr p -+ ) -+{ -+ return DynamicAny::DynValue::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynValue_release ( -+ DynamicAny::DynValue_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynValue_ptr -+tao_DynamicAny_DynValue_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynValue::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynValue_ptr -+tao_DynamicAny_DynValue_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynValue::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynValue_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynValue **tmp = -+ ACE_static_cast (DynamicAny::DynValue **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -2032,6 +2376,49 @@ - - #if !defined (_DYNAMICANY_DYNANYFACTORY___CI_) - #define _DYNAMICANY_DYNANYFACTORY___CI_ -+ -+ACE_INLINE DynamicAny::DynAnyFactory_ptr -+tao_DynamicAny_DynAnyFactory_duplicate ( -+ DynamicAny::DynAnyFactory_ptr p -+ ) -+{ -+ return DynamicAny::DynAnyFactory::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_DynamicAny_DynAnyFactory_release ( -+ DynamicAny::DynAnyFactory_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE DynamicAny::DynAnyFactory_ptr -+tao_DynamicAny_DynAnyFactory_nil ( -+ void -+ ) -+{ -+ return DynamicAny::DynAnyFactory::_nil (); -+} -+ -+ACE_INLINE DynamicAny::DynAnyFactory_ptr -+tao_DynamicAny_DynAnyFactory_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return DynamicAny::DynAnyFactory::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_DynamicAny_DynAnyFactory_upcast ( -+ void *src -+ ) -+{ -+ DynamicAny::DynAnyFactory **tmp = -+ ACE_static_cast (DynamicAny::DynAnyFactory **, src); -+ return *tmp; -+} - - - #endif /* end #if !defined */ diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 7ba4063eb33..92e560b019a 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -66,6 +66,18 @@ CORBA_UnknownUserException::_raise (void) TAO_RAISE (*this); } +CORBA::Exception * +CORBA_UnknownUserException::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA_UnknownUserException (*this), + 0 + ); + return result; +} + void CORBA_UnknownUserException::_tao_encode ( TAO_OutputCDR & @@ -87,4 +99,3 @@ CORBA_UnknownUserException::_type (void) const { return CORBA::_tc_UnknownUserException; } - diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index 8d2a8cd7c0f..8cd745ec930 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -73,6 +73,7 @@ public: /// To throw an UnknownUserException of this type. virtual void _raise (void); + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _tao_encode (TAO_OutputCDR &cdr ACE_ENV_ARG_DECL) const; virtual void _tao_decode (TAO_InputCDR &cdr diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 61fc4bee536..ec3ecad6848 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -19,12 +19,11 @@ CORBA_Environment::CORBA_Environment (void) } CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs) - : exception_ (rhs.exception_) + : exception_ (0) , previous_ (0) { - // TAO_ORB_Core_instance ()->default_environment (this); - if (this->exception_) - this->exception_->_incr_refcnt (); + if (rhs.exception_) + this->exception_ = rhs.exception_->_tao_duplicate (); } CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core) @@ -37,11 +36,17 @@ CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core) CORBA_Environment& CORBA_Environment::operator= (const CORBA_Environment& rhs) { - if (this != &rhs) - { - this->clear (); - this->exception (rhs.exception_); - } + CORBA_Environment tmp (rhs); + { + CORBA_Exception *tmp_ex = this->exception_; + this->exception_ = rhs.exception_; + tmp.exception_ = tmp_ex; + } + { + CORBA_Environment *tmp_env = this->previous_; + this->previous_ = rhs.previous_; + tmp.previous_ = tmp_env; + } return *this; } @@ -59,26 +64,37 @@ CORBA_Environment::~CORBA_Environment (void) void CORBA_Environment::exception (CORBA_Exception *ex) { + // @@ This does not look right, setting the exception to the + // contained exception is a bug, the application is only + // supposed to pass in a pointer to an exception that it (the + // application) owns, however, if we contain the exception then + // *WE* own it. + // Normally I (coryan) would remove code like this, but I feel + // that it is a typical example of defensive programming for the + // *BAD*, i.e. we are not helping the application to get better + // and only making the ORB bigger and slower. +#if 0 if (ex != this->exception_) { this->clear (); - this->exception_ = ex; } - if (this->exception_ != 0) - { - this->exception_->_incr_refcnt (); +#else + ACE_ASSERT (ex != this->exception_); + this->clear (); +#endif /* 0 */ + + this->exception_ = ex; + #if defined (TAO_HAS_EXCEPTIONS) - this->exception_->_raise (); + if (this->exception_ != 0) + this->exception_->_raise (); #endif /* TAO_HAS_EXCEPTIONS */ - } } void CORBA_Environment::clear (void) { - if (this->exception_) - this->exception_->_decr_refcnt (); - + delete this->exception_; this->exception_ = 0; } @@ -193,26 +209,21 @@ CORBA::Environment::print_exception (const char *info, CORBA_Environment_var & CORBA_Environment_var::operator= (CORBA_Environment_ptr p) { - if (this->ptr_ != p) - { - if (this->ptr_ != 0) - delete (this->ptr_); - - this->ptr_ = p; - } + CORBA_Environment_var tmp (p); + // @@ We need as ACE_Swap<> template!! + CORBA_Environment *tmp_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = tmp_ptr; return *this; } CORBA_Environment_var & CORBA_Environment_var::operator= (const CORBA_Environment_var &r) { - if (this->ptr_ != 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - - ACE_NEW_RETURN (this->ptr_, - CORBA::Environment (*r.ptr_), *this); + CORBA_Environment_var tmp (r); + // @@ We need as ACE_Swap<> template!! + CORBA_Environment *tmp_ptr = this->ptr_; + this->ptr_ = tmp.ptr_; + tmp.ptr_ = tmp_ptr; return *this; } diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 993227d8983..1779f5b6687 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -75,11 +75,28 @@ public: static CORBA_Environment * _duplicate (CORBA_Environment *); static CORBA_Environment * _nil (void); - /// Return the exception. Caller must call <_incr_refcnf> in order - /// to keep the ptr. + /// Return the contained CORBA::Exception. + /** + * CORBA::Environment retains ownership of the exception, this is + * contrary to the normal memory management rules in the C++ + * mapping, but actually mandated by the specification: + * + * "C++ Language Mapping" (formal/00-01-02). Section 1.27 + * Environment (page 1-113) + * + */ CORBA_Exception* exception (void) const; - /// Set the exception to <ex>, taking a reference on it. + /// Set the contained CORBA::Exception to <ex> + /** + * CORBA::Environment assumes ownership of the exception, this is + * contrary to the normal memory management rules in the C++ + * mapping, but actually mandated by the specification: + * + * "C++ Language Mapping" (formal/00-01-02). Section 1.27 + * Environment (page 1-113) + * + */ void exception (CORBA_Exception *ex); /// Return if the exception is a user exception or a system diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 902a399b26f..85ab68a06c1 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -42,15 +42,13 @@ extern CORBA::TypeCode_ptr TC_completion_status; // **************************************************************** CORBA_Exception::CORBA_Exception (const char *repository_id) - : id_ (CORBA::string_dup (repository_id)), - refcount_ (0) + : id_ (CORBA::string_dup (repository_id)) { ACE_ASSERT (this->id_ != 0); } CORBA_Exception::CORBA_Exception (const CORBA_Exception &src) - : id_ (CORBA::string_dup (src.id_)), - refcount_ (0) + : id_ (CORBA::string_dup (src.id_)) { ACE_ASSERT (this->id_ != 0); } @@ -60,15 +58,12 @@ CORBA_Exception::CORBA_Exception (const CORBA_Exception &src) // can do this because it's got the typecode. CORBA_Exception::CORBA_Exception (void) - : id_ (0), - refcount_ (0) + : id_ (0) { } CORBA_Exception::~CORBA_Exception (void) { - ACE_ASSERT (this->refcount_ == 0); - CORBA::string_free (this->id_); } @@ -120,29 +115,6 @@ CORBA_Exception::_tao_any_destructor (void *x) delete tmp; } -CORBA::ULong -CORBA_Exception::_incr_refcnt (void) -{ - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); - return ++this->refcount_; -} - -CORBA::ULong -CORBA_Exception::_decr_refcnt (void) -{ - { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); - this->refcount_--; - if (this->refcount_ != 0) - return this->refcount_; - - // release the lock before destroying the object. - } - - delete this; - return 0; -} - #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) // Convenient ostrean operator. @@ -1154,6 +1126,17 @@ CORBA_##name ::_tao_any_destructor (void *x) \ STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA_Exception * \ +CORBA_##name ::_tao_duplicate (void) const \ +{ \ + CORBA_Exception *result; \ + ACE_NEW_RETURN (result, CORBA_##name (*this), 0); \ + return result; \ +} +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + static void tao_insert_for_insertion_system_exception (CORBA::Any &any, const CORBA::SystemException &ex, diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 3dce5909d54..b28a2204388 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -100,9 +100,24 @@ public: /// Used in the non-copying Any insertion operator. static void _tao_any_destructor (void *); - // = Methods required for memory management support. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + /// Deep copy + /** + * The following operation is used in the implementation of + * it performs a deep copy of the + * exception, normally it is implemented as: + * + * <PRE> + * class SomeException : public // Derives from CORBA_Exception + * { + * public: + * virtual CORBA_Exception *_tao_duplicate (void) const + * { + * return new SomeException (*this); + * } + * }; + * </PRE> + */ + virtual CORBA_Exception *_tao_duplicate (void) const = 0; protected: CORBA_Exception (void); @@ -111,17 +126,6 @@ protected: private: /// Storage of our repository id. char *id_; - - /// Reference count to avoid copying overhead. - CORBA::ULong refcount_; - - /** - * Mutex to protect the reference count; though in most cases this - * class is used only in one thread adding a mutex here is *not* - * expensive, because uses of this class should never be on the - * critical path. - */ - TAO_SYNCH_MUTEX refcount_lock_; }; #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -279,6 +283,7 @@ public: \ virtual void _raise (void); \ virtual CORBA::TypeCode_ptr _type (void) const; \ static void _tao_any_destructor (void*); \ + virtual CORBA_Exception *_tao_duplicate (void) const; \ }; \ TAO_Export void operator<<= (CORBA::Any &, const CORBA_##name &); \ TAO_Export void operator<<= (CORBA::Any &, CORBA_##name *); \ diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i index 16ac2878227..73084d4fb08 100644 --- a/TAO/tao/Exception.i +++ b/TAO/tao/Exception.i @@ -36,4 +36,3 @@ CORBA_SystemException::completed (CORBA::CompletionStatus c) { this->completed_ = c; } - diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl index b10c6cf87d0..e9da0b786da 100644 --- a/TAO/tao/GIOP.pidl +++ b/TAO/tao/GIOP.pidl @@ -14,7 +14,7 @@ // is: // // tao_idl -// -Ge 1 +// -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 // -Wb,export_macro=TAO_Export // -Wb,export_include="tao/TAO_Export.h" // -Wb,pre_include="ace/pre.h" @@ -24,7 +24,7 @@ // ================================================================ #pragma prefix "omg.org" #include "IOP.pidl" -module GIOP +module GIOP { typedef short AddressingDisposition; const short KeyAddr = 0; @@ -36,13 +36,13 @@ module GIOP octet major; octet minor; }; - struct IORAddressingInfo + struct IORAddressingInfo { unsigned long selected_profile_index; IOP::IOR ior; }; - union TargetAddress switch (AddressingDisposition) + union TargetAddress switch (AddressingDisposition) { case KeyAddr: sequence <octet> object_key; case ProfileAddr: IOP::TaggedProfile profile; diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl index 07a72d6dd9a..e1948a7a139 100644 --- a/TAO/tao/IFR_Client/IFR_Base.pidl +++ b/TAO/tao/IFR_Client/IFR_Base.pidl @@ -14,7 +14,7 @@ // The original file Interface.idl was split into four pieces, to // keep the generated files to a manageable size and reduce build // time. This IDL file contains the abstract base interfaces of -// the IFR as well as many of the non-interface data types used +// the IFR as well as many of the non-interface data types used // by all other IFR interfaces. // // 1. Patch this pidl file with @@ -25,7 +25,7 @@ // declared in it as CORBA_foo, unalias the simple typedefs // which don't have a CORBA_ analog in corbafwd.h. // -// 2. Generate the code. The command used to generate code from this +// 2. Generate the code. The command used to generate code from this // IDL file is: // // tao_idl -o orig -Ge 1 -I.. \ @@ -38,7 +38,7 @@ // 3. Copy the generated files to the current directory. // // 4. Patch the generated files, using -// +// // patch < diffs/IFR_BaseC.h.diff // patch < diffs/IFR_BaseC.i.diff // patch < diffs/IFR_BaseC.cpp.diff @@ -52,8 +52,8 @@ // // 5. Restore IFR_Base.pidl. // -// To regenerate the skeleton files IFR_BaseS.{h,i,cpp} and -// IFR_BaseS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service, use the +// To regenerate the skeleton files IFR_BaseS.{h,i,cpp} and +// IFR_BaseS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service, use the // command // // tao_idl -o ../../orbsvcs/IFR_Service/orig -Ge 1 \ @@ -68,43 +68,43 @@ #pragma prefix "omg.org" -module CORBA +module CORBA { typedef string Identifier; typedef string ScopedName; typedef string RepositoryId; - enum DefinitionKind + enum DefinitionKind { - dk_none, + dk_none, dk_all, - dk_Attribute, - dk_Constant, - dk_Exception, + dk_Attribute, + dk_Constant, + dk_Exception, dk_Interface, - dk_Module, - dk_Operation, + dk_Module, + dk_Operation, dk_Typedef, - dk_Alias, - dk_Struct, - dk_Union, + dk_Alias, + dk_Struct, + dk_Union, dk_Enum, - dk_Primitive, - dk_String, - dk_Sequence, + dk_Primitive, + dk_String, + dk_Sequence, dk_Array, dk_Repository, - dk_Wstring, + dk_Wstring, dk_Fixed, - dk_Value, - dk_ValueBox, + dk_Value, + dk_ValueBox, dk_ValueMember, dk_Native, dk_AbstractInterface, dk_LocalInterface }; - interface IRObject + interface IRObject { // read interface readonly attribute DefinitionKind def_kind; @@ -118,7 +118,7 @@ module CORBA interface Repository; interface Container; - interface Contained : IRObject + interface Contained : IRObject { // read/write interface attribute RepositoryId id; @@ -129,8 +129,8 @@ module CORBA readonly attribute Container defined_in; readonly attribute ScopedName absolute_name; readonly attribute Repository containing_repository; - - struct Description + + struct Description { DefinitionKind kind; any value; @@ -167,7 +167,7 @@ module CORBA interface LocalInterfaceDef; typedef sequence<LocalInterfaceDef> LocalInterfaceDefSeq; - struct StructMember + struct StructMember { Identifier name; TypeCode type; @@ -176,7 +176,7 @@ module CORBA typedef sequence <StructMember> StructMemberSeq; - struct Initializer + struct Initializer { StructMemberSeq members; Identifier name; @@ -184,7 +184,7 @@ module CORBA typedef sequence <Initializer> InitializerSeq; - struct UnionMember + struct UnionMember { Identifier name; any label; @@ -195,7 +195,7 @@ module CORBA typedef sequence <UnionMember> UnionMemberSeq; typedef sequence <Identifier> EnumMemberSeq; - interface Container : IRObject + interface Container : IRObject { // read interface Contained lookup ( @@ -211,7 +211,7 @@ module CORBA in DefinitionKind limit_type, in boolean exclude_inherited ); - struct Description + struct Description { Contained contained_object; DefinitionKind kind; @@ -312,16 +312,16 @@ module CORBA ); }; - interface IDLType : IRObject + interface IDLType : IRObject { readonly attribute TypeCode type; }; - interface TypedefDef : Contained, IDLType + interface TypedefDef : Contained, IDLType { }; - struct TypeDescription + struct TypeDescription { Identifier name; RepositoryId id; diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl index 01c99db6e6c..21064aa7983 100644 --- a/TAO/tao/IIOP.pidl +++ b/TAO/tao/IIOP.pidl @@ -8,6 +8,7 @@ // is: // // tao_idl \ +// -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 // -Wb,export_macro=TAO_Export \ // -Wb,export_include="tao/TAO_Export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl index 91078185b14..8e111dc8c94 100644 --- a/TAO/tao/IOP.pidl +++ b/TAO/tao/IOP.pidl @@ -1,25 +1,35 @@ // -*- IDL -*- -// -// $Id$ - -// -// This file was used to generate the code in -// IOP*.* The command used to generate code -// is: -// -// tao_idl -// -Ge 1 -// -Wb,export_macro=TAO_Export -// -Wb,export_include="tao/TAO_Export.h" -// -Wb,pre_include="ace/pre.h" -// -Wb,post_include="ace/post.h" -// IOP.pidl -// +/** + * @file IOP.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the IOP module. + * + * This file is used to generate IOPC.{h,i,cpp}, using the following + * command: + * + * tao_idl.exe + * -o orig -Gp -Gd -Ge 1 -Gv + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * IOP.pidl + * + * and then: + * + * cp orig/IOPC.{h,i,cpp} . + * patch < diffs/IOP.diff + * + * The code left in IOPC.{h,i,cpp} is ready for use. + * + */ #ifndef TAO_IOP_PIDL #define TAO_IOP_PIDL -#include "orb.idl" +#include <orb.idl> #pragma prefix "omg.org" diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 2fd12da18b4..4036420763e 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -21,32 +21,39 @@ #include "IOPC.h" +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) #include "IOPC.i" #endif /* !defined INLINE */ -#include "Typecode.h" -#include "ORB_Core.h" - static const CORBA::Long _oc_IOP_ProfileId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ProfileId:1.0 10, - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000), // name = ProfileId CORBA::tk_ulong, @@ -62,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProfileId, &_tc_TAO_tc_IOP_ProfileId) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ProfileId, &_tc_TAO_tc_IOP_ProfileId) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) @@ -77,19 +84,19 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] = { TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x65645072), - ACE_NTOHL (0x6f66696c), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x65645072), + ACE_NTOHL (0x6f66696c), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0 14, - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x65645072), - ACE_NTOHL (0x6f66696c), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x65645072), + ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000), // name = TaggedProfile 2, // member count 4, @@ -98,25 +105,25 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ProfileId:1.0 10, - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000), // name = ProfileId CORBA::tk_ulong, 13, - ACE_NTOHL (0x70726f66), - ACE_NTOHL (0x696c655f), - ACE_NTOHL (0x64617461), + ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x696c655f), + ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = profile_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -137,12 +144,12 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedProfile, &_tc_TAO_tc_IOP_TaggedProfile) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TaggedProfile, &_tc_TAO_tc_IOP_TaggedProfile) TAO_NAMESPACE_END -void IOP::TaggedProfile::_tao_any_destructor (void *x) +void IOP::TaggedProfile::_tao_any_destructor (void *_tao_void_pointer) { - TaggedProfile *tmp = ACE_static_cast (TaggedProfile*,x); + TaggedProfile *tmp = ACE_static_cast (TaggedProfile*, _tao_void_pointer); delete tmp; } @@ -157,37 +164,37 @@ void IOP::TaggedProfile::_tao_any_destructor (void *x) IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void) {} IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor {} -void IOP::TaggedProfile::_tao_seq_Octet::_tao_any_destructor (void *x) +void IOP::TaggedProfile::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer) { - _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); + _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer); delete tmp; } @@ -198,23 +205,23 @@ static const CORBA::Long _oc_IOP_IOR[] = { TAO_ENCAP_BYTE_ORDER, // byte order 24, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x494f523a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/IOR:1.0 4, ACE_NTOHL (0x494f5200), // name = IOR 2, // member count 8, - ACE_NTOHL (0x74797065), + ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400), // name = type_id - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, - ACE_NTOHL (0x70726f66), - ACE_NTOHL (0x696c6573), + ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0), // name = profiles CORBA::tk_sequence, // typecode kind 200, // encapsulation length @@ -223,19 +230,19 @@ static const CORBA::Long _oc_IOP_IOR[] = 184, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x65645072), - ACE_NTOHL (0x6f66696c), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x65645072), + ACE_NTOHL (0x6f66696c), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0 14, - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x65645072), - ACE_NTOHL (0x6f66696c), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x65645072), + ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000), // name = TaggedProfile 2, // member count 4, @@ -244,25 +251,25 @@ static const CORBA::Long _oc_IOP_IOR[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ProfileId:1.0 10, - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000), // name = ProfileId CORBA::tk_ulong, 13, - ACE_NTOHL (0x70726f66), - ACE_NTOHL (0x696c655f), - ACE_NTOHL (0x64617461), + ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x696c655f), + ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = profile_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -286,12 +293,12 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_IOR ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IOR, &_tc_TAO_tc_IOP_IOR) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IOR, &_tc_TAO_tc_IOP_IOR) TAO_NAMESPACE_END -void IOP::IOR::_tao_any_destructor (void *x) +void IOP::IOR::_tao_any_destructor (void *_tao_void_pointer) { - IOR *tmp = ACE_static_cast (IOR*,x); + IOR *tmp = ACE_static_cast (IOR*, _tao_void_pointer); delete tmp; } @@ -301,48 +308,48 @@ void IOP::IOR::_tao_any_destructor (void *x) #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_ - void - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_allocate_buffer (CORBA::ULong length) +void +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_allocate_buffer (CORBA::ULong length) +{ + IOP::TaggedProfile* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (length); + + if (this->buffer_ != 0) { - IOP::TaggedProfile* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::TaggedProfile *old = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old); - - } - this->buffer_ = tmp; + IOP::TaggedProfile *old = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old); + } + this->buffer_ = tmp; +} - void - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_); - - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); - this->buffer_ = 0; - } +void +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); + this->buffer_ = 0; +} - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Dtor. - { - this->_deallocate_buffer (); - } +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_) #define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_ @@ -354,37 +361,37 @@ void IOP::IOR::_tao_any_destructor (void *x) IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile +_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedProfile> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedProfile> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile +_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedProfile> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedProfile> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile +_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedProfile> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedProfile> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor {} -void IOP::IOR::_tao_seq_TaggedProfile::_tao_any_destructor (void *x) +void IOP::IOR::_tao_seq_TaggedProfile::_tao_any_destructor (void *_tao_void_pointer) { - _tao_seq_TaggedProfile *tmp = ACE_static_cast (_tao_seq_TaggedProfile*,x); + _tao_seq_TaggedProfile *tmp = ACE_static_cast (_tao_seq_TaggedProfile*, _tao_void_pointer); delete tmp; } @@ -395,17 +402,17 @@ static const CORBA::Long _oc_IOP_ComponentId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x7449643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/ComponentId:1.0 12, - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400), // name = ComponentId CORBA::tk_ulong, @@ -421,26 +428,26 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentId, &_tc_TAO_tc_IOP_ComponentId) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ComponentId, &_tc_TAO_tc_IOP_ComponentId) TAO_NAMESPACE_END static const CORBA::Long _oc_IOP_TaggedComponent[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0 16, - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400), // name = TaggedComponent 2, // member count 4, @@ -449,25 +456,25 @@ static const CORBA::Long _oc_IOP_TaggedComponent[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x7449643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/ComponentId:1.0 12, - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400), // name = ComponentId CORBA::tk_ulong, 15, - ACE_NTOHL (0x636f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x745f6461), + ACE_NTOHL (0x636f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -488,12 +495,12 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponent, &_tc_TAO_tc_IOP_TaggedComponent) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TaggedComponent, &_tc_TAO_tc_IOP_TaggedComponent) TAO_NAMESPACE_END -void IOP::TaggedComponent::_tao_any_destructor (void *x) +void IOP::TaggedComponent::_tao_any_destructor (void *_tao_void_pointer) { - TaggedComponent *tmp = ACE_static_cast (TaggedComponent*,x); + TaggedComponent *tmp = ACE_static_cast (TaggedComponent*, _tao_void_pointer); delete tmp; } @@ -508,37 +515,37 @@ void IOP::TaggedComponent::_tao_any_destructor (void *x) IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void) {} IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor {} -void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x) +void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer) { - _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); + _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer); delete tmp; } @@ -551,48 +558,48 @@ void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x) #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_ - void - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_allocate_buffer (CORBA::ULong length) +void +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_allocate_buffer (CORBA::ULong length) +{ + IOP::TaggedComponent* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (length); + + if (this->buffer_ != 0) { - IOP::TaggedComponent* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old); - - } - this->buffer_ = tmp; + IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old); + } + this->buffer_ = tmp; +} - void - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); - - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); - this->buffer_ = 0; - } +void +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); + this->buffer_ = 0; +} - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Dtor. - { - this->_deallocate_buffer (); - } +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_) #define _IOP_MULTIPLECOMPONENTPROFILE_CS_ @@ -604,37 +611,37 @@ void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x) IOP::MultipleComponentProfile::MultipleComponentProfile (void) {} IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile +_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile +_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile +_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor {} -void IOP::MultipleComponentProfile::_tao_any_destructor (void *x) +void IOP::MultipleComponentProfile::_tao_any_destructor (void *_tao_void_pointer) { - MultipleComponentProfile *tmp = ACE_static_cast (MultipleComponentProfile*,x); + MultipleComponentProfile *tmp = ACE_static_cast (MultipleComponentProfile*, _tao_void_pointer); delete tmp; } @@ -645,25 +652,25 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x4d756c74), - ACE_NTOHL (0x69706c65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x7450726f), - ACE_NTOHL (0x66696c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x4d756c74), + ACE_NTOHL (0x69706c65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x7450726f), + ACE_NTOHL (0x66696c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0 25, - ACE_NTOHL (0x4d756c74), - ACE_NTOHL (0x69706c65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x7450726f), - ACE_NTOHL (0x66696c65), + ACE_NTOHL (0x4d756c74), + ACE_NTOHL (0x69706c65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x7450726f), + ACE_NTOHL (0x66696c65), ACE_NTOHL (0x0), // name = MultipleComponentProfile CORBA::tk_sequence, // typecode kind 200, // encapsulation length @@ -672,19 +679,19 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] = 184, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0 16, - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400), // name = TaggedComponent 2, // member count 4, @@ -693,25 +700,25 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x7449643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/ComponentId:1.0 12, - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400), // name = ComponentId CORBA::tk_ulong, 15, - ACE_NTOHL (0x636f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x745f6461), + ACE_NTOHL (0x636f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -735,7 +742,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultipleComponentProfile, &_tc_TAO_tc_IOP_MultipleComponentProfile) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_MultipleComponentProfile, &_tc_TAO_tc_IOP_MultipleComponentProfile) TAO_NAMESPACE_END @@ -744,48 +751,48 @@ TAO_NAMESPACE_END #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_ - void - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_allocate_buffer (CORBA::ULong length) +void +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_allocate_buffer (CORBA::ULong length) +{ + IOP::TaggedComponent* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (length); + + if (this->buffer_ != 0) { - IOP::TaggedComponent* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old); - - } - this->buffer_ = tmp; + IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old); + } + this->buffer_ = tmp; +} - void - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); - - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); - this->buffer_ = 0; - } +void +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); + this->buffer_ = 0; +} - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Dtor. - { - this->_deallocate_buffer (); - } +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_) #define _IOP_TAGGEDCOMPONENTLIST_CS_ @@ -797,37 +804,37 @@ TAO_NAMESPACE_END IOP::TaggedComponentList::TaggedComponentList (void) {} IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentList +_TAO_Unbounded_Sequence_IOP_TaggedComponentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentList +_TAO_Unbounded_Sequence_IOP_TaggedComponentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::TaggedComponentList::TaggedComponentList (const TaggedComponentList &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentList +_TAO_Unbounded_Sequence_IOP_TaggedComponentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::TaggedComponentList::~TaggedComponentList (void) // dtor {} -void IOP::TaggedComponentList::_tao_any_destructor (void *x) +void IOP::TaggedComponentList::_tao_any_destructor (void *_tao_void_pointer) { - TaggedComponentList *tmp = ACE_static_cast (TaggedComponentList*,x); + TaggedComponentList *tmp = ACE_static_cast (TaggedComponentList*, _tao_void_pointer); delete tmp; } @@ -838,21 +845,21 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e744c), - ACE_NTOHL (0x6973743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x6973743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0 20, - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = TaggedComponentList CORBA::tk_sequence, // typecode kind 200, // encapsulation length @@ -861,19 +868,19 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] = 184, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0 16, - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400), // name = TaggedComponent 2, // member count 4, @@ -882,25 +889,25 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x7449643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/ComponentId:1.0 12, - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400), // name = ComponentId CORBA::tk_ulong, 15, - ACE_NTOHL (0x636f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x745f6461), + ACE_NTOHL (0x636f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -924,7 +931,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponentList, &_tc_TAO_tc_IOP_TaggedComponentList) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TaggedComponentList, &_tc_TAO_tc_IOP_TaggedComponentList) TAO_NAMESPACE_END @@ -933,48 +940,48 @@ TAO_NAMESPACE_END #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_ - void - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_allocate_buffer (CORBA::ULong length) +void +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_allocate_buffer (CORBA::ULong length) +{ + IOP::TaggedComponent* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (length); + + if (this->buffer_ != 0) { - IOP::TaggedComponent* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (old); - - } - this->buffer_ = tmp; + IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (old); + } + this->buffer_ = tmp; +} - void - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); - - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); - this->buffer_ = 0; - } +void +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); + this->buffer_ = 0; +} - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Dtor. - { - this->_deallocate_buffer (); - } +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_) #define _IOP_TAGGEDCOMPONENTSEQ_CS_ @@ -986,37 +993,37 @@ TAO_NAMESPACE_END IOP::TaggedComponentSeq::TaggedComponentSeq (void) {} IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq +_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq +_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::TaggedComponentSeq::TaggedComponentSeq (const TaggedComponentSeq &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq +_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::TaggedComponentSeq::~TaggedComponentSeq (void) // dtor {} -void IOP::TaggedComponentSeq::_tao_any_destructor (void *x) +void IOP::TaggedComponentSeq::_tao_any_destructor (void *_tao_void_pointer) { - TaggedComponentSeq *tmp = ACE_static_cast (TaggedComponentSeq*,x); + TaggedComponentSeq *tmp = ACE_static_cast (TaggedComponentSeq*, _tao_void_pointer); delete tmp; } @@ -1027,21 +1034,21 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e7453), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e7453), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0 19, - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e7453), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e7453), ACE_NTOHL (0x65710000), // name = TaggedComponentSeq CORBA::tk_sequence, // typecode kind 200, // encapsulation length @@ -1050,19 +1057,19 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] = 184, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0 16, - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400), // name = TaggedComponent 2, // member count 4, @@ -1071,25 +1078,25 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x7449643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/ComponentId:1.0 12, - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400), // name = ComponentId CORBA::tk_ulong, 15, - ACE_NTOHL (0x636f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x745f6461), + ACE_NTOHL (0x636f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -1113,7 +1120,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponentSeq, &_tc_TAO_tc_IOP_TaggedComponentSeq) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TaggedComponentSeq, &_tc_TAO_tc_IOP_TaggedComponentSeq) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) @@ -1160,17 +1167,17 @@ static const CORBA::Long _oc_IOP_ServiceId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ServiceId:1.0 10, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636549), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000), // name = ServiceId CORBA::tk_ulong, @@ -1186,55 +1193,55 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceId, &_tc_TAO_tc_IOP_ServiceId) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServiceId, &_tc_TAO_tc_IOP_ServiceId) TAO_NAMESPACE_END static const CORBA::Long _oc_IOP_ServiceContext[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636543), - ACE_NTOHL (0x6f6e7465), - ACE_NTOHL (0x78743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636543), + ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/ServiceContext:1.0 15, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636543), - ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636543), + ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000), // name = ServiceContext 2, // member count 11, - ACE_NTOHL (0x636f6e74), - ACE_NTOHL (0x6578745f), + ACE_NTOHL (0x636f6e74), + ACE_NTOHL (0x6578745f), ACE_NTOHL (0x69640000), // name = context_id CORBA::tk_alias, // typecode kind for typedefs 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ServiceId:1.0 10, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636549), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000), // name = ServiceId CORBA::tk_ulong, 13, - ACE_NTOHL (0x636f6e74), - ACE_NTOHL (0x6578745f), - ACE_NTOHL (0x64617461), + ACE_NTOHL (0x636f6e74), + ACE_NTOHL (0x6578745f), + ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = context_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -1255,12 +1262,12 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContext, &_tc_TAO_tc_IOP_ServiceContext) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServiceContext, &_tc_TAO_tc_IOP_ServiceContext) TAO_NAMESPACE_END -void IOP::ServiceContext::_tao_any_destructor (void *x) +void IOP::ServiceContext::_tao_any_destructor (void *_tao_void_pointer) { - ServiceContext *tmp = ACE_static_cast (ServiceContext*,x); + ServiceContext *tmp = ACE_static_cast (ServiceContext*, _tao_void_pointer); delete tmp; } @@ -1275,37 +1282,37 @@ void IOP::ServiceContext::_tao_any_destructor (void *x) IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void) {} IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> +TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor {} -void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x) +void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer) { - _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); + _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer); delete tmp; } @@ -1318,48 +1325,48 @@ void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x) #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_ - void - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_allocate_buffer (CORBA::ULong length) +void +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_allocate_buffer (CORBA::ULong length) +{ + IOP::ServiceContext* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (length); + + if (this->buffer_ != 0) { - IOP::ServiceContext* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::ServiceContext *old = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old); - - } - this->buffer_ = tmp; + IOP::ServiceContext *old = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old); + } + this->buffer_ = tmp; +} - void - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_); - - _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); - this->buffer_ = 0; - } +void +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); + this->buffer_ = 0; +} - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Dtor. - { - this->_deallocate_buffer (); - } +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IOP_SERVICECONTEXTLIST_CS_) #define _IOP_SERVICECONTEXTLIST_CS_ @@ -1371,37 +1378,37 @@ void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x) IOP::ServiceContextList::ServiceContextList (void) {} IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_ServiceContextList +_TAO_Unbounded_Sequence_IOP_ServiceContextList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::ServiceContext> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::ServiceContext> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::ServiceContextList::ServiceContextList (CORBA::ULong max, CORBA::ULong length, IOP::ServiceContext *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_ServiceContextList +_TAO_Unbounded_Sequence_IOP_ServiceContextList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::ServiceContext> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::ServiceContext> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_ServiceContextList +_TAO_Unbounded_Sequence_IOP_ServiceContextList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::ServiceContext> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<IOP::ServiceContext> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::ServiceContextList::~ServiceContextList (void) // dtor {} -void IOP::ServiceContextList::_tao_any_destructor (void *x) +void IOP::ServiceContextList::_tao_any_destructor (void *_tao_void_pointer) { - ServiceContextList *tmp = ACE_static_cast (ServiceContextList*,x); + ServiceContextList *tmp = ACE_static_cast (ServiceContextList*, _tao_void_pointer); delete tmp; } @@ -1412,21 +1419,21 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636543), - ACE_NTOHL (0x6f6e7465), - ACE_NTOHL (0x78744c69), - ACE_NTOHL (0x73743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636543), + ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x78744c69), + ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0 19, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636543), - ACE_NTOHL (0x6f6e7465), - ACE_NTOHL (0x78744c69), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636543), + ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x78744c69), ACE_NTOHL (0x73740000), // name = ServiceContextList CORBA::tk_sequence, // typecode kind 208, // encapsulation length @@ -1435,48 +1442,48 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] = 192, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636543), - ACE_NTOHL (0x6f6e7465), - ACE_NTOHL (0x78743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636543), + ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/ServiceContext:1.0 15, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636543), - ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636543), + ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000), // name = ServiceContext 2, // member count 11, - ACE_NTOHL (0x636f6e74), - ACE_NTOHL (0x6578745f), + ACE_NTOHL (0x636f6e74), + ACE_NTOHL (0x6578745f), ACE_NTOHL (0x69640000), // name = context_id CORBA::tk_alias, // typecode kind for typedefs 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ServiceId:1.0 10, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636549), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000), // name = ServiceId CORBA::tk_ulong, 13, - ACE_NTOHL (0x636f6e74), - ACE_NTOHL (0x6578745f), - ACE_NTOHL (0x64617461), + ACE_NTOHL (0x636f6e74), + ACE_NTOHL (0x6578745f), + ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = context_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -1500,7 +1507,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContextList, &_tc_TAO_tc_IOP_ServiceContextList) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServiceContextList, &_tc_TAO_tc_IOP_ServiceContextList) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) @@ -1567,7 +1574,18 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13U) TAO_NAMESPACE_END - +TAO_NAMESPACE_TYPE (const CORBA::ULong) +TAO_NAMESPACE_BEGIN (IOP) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_UIPMC, 1413566220U) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::ULong) +TAO_NAMESPACE_BEGIN (IOP) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GROUP, 1413566211U) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::ULong) +TAO_NAMESPACE_BEGIN (IOP) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GROUP_IIOP, 1413566212U) +TAO_NAMESPACE_END int IOP::Codec::_tao_class_id = 0; IOP::Codec_ptr @@ -1612,8 +1630,11 @@ tao_IOP_Codec_upcast ( ACE_static_cast (IOP::Codec **, src); return *tmp; } + // ************************************************************* -// Operations for class IOP::Codec_var +// IOP::Codec_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* IOP::Codec_var::Codec_var (void) // default constructor @@ -1660,7 +1681,7 @@ IOP::Codec_var::operator const ::IOP::Codec_ptr &() const // cast return this->ptr_; } -IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast +IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast { return this->ptr_; } @@ -1736,7 +1757,9 @@ IOP::Codec_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class IOP::Codec_out +// IOP::Codec_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* IOP::Codec_out::Codec_out (Codec_ptr &p) @@ -1795,12 +1818,12 @@ IOP::Codec_out::operator-> (void) } -// default constructor -IOP::Codec::Codec () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +IOP::Codec::Codec (void) +{} -// destructor IOP::Codec::~Codec (void) {} @@ -1812,7 +1835,8 @@ IOP::Codec_ptr IOP::Codec::_narrow ( return Codec::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -IOP::Codec_ptr IOP::Codec::_unchecked_narrow ( +IOP::Codec_ptr +IOP::Codec::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -1852,7 +1876,7 @@ void *IOP::Codec::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1888,7 +1912,6 @@ IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeFo return *this; } -// Narrow. IOP::Codec::InvalidTypeForEncoding * IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *exc) { @@ -1902,6 +1925,25 @@ IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::IOP::Codec::InvalidTypeForEncoding, 0); + return retval; +} + +CORBA::Exception * +IOP::Codec::InvalidTypeForEncoding::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + IOP::Codec::InvalidTypeForEncoding (*this), + 0 + ); + return result; +} + void IOP::Codec::InvalidTypeForEncoding::_raise () { TAO_RAISE (*this); @@ -1923,14 +1965,6 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::IOP::Codec::InvalidTypeForEncoding, 0); - return retval; -} - // Default constructor. IOP::Codec::FormatMismatch::FormatMismatch (void) : CORBA_UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0") @@ -1956,7 +1990,6 @@ IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_ return *this; } -// Narrow. IOP::Codec::FormatMismatch * IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *exc) { @@ -1970,6 +2003,25 @@ IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::IOP::Codec::FormatMismatch, 0); + return retval; +} + +CORBA::Exception * +IOP::Codec::FormatMismatch::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + IOP::Codec::FormatMismatch (*this), + 0 + ); + return result; +} + void IOP::Codec::FormatMismatch::_raise () { TAO_RAISE (*this); @@ -1991,14 +2043,6 @@ void IOP::Codec::FormatMismatch::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::IOP::Codec::FormatMismatch, 0); - return retval; -} - // Default constructor. IOP::Codec::TypeMismatch::TypeMismatch (void) : CORBA_UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0") @@ -2024,7 +2068,6 @@ IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp return *this; } -// Narrow. IOP::Codec::TypeMismatch * IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *exc) { @@ -2038,6 +2081,25 @@ IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::IOP::Codec::TypeMismatch, 0); + return retval; +} + +CORBA::Exception * +IOP::Codec::TypeMismatch::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + IOP::Codec::TypeMismatch (*this), + 0 + ); + return result; +} + void IOP::Codec::TypeMismatch::_raise () { TAO_RAISE (*this); @@ -2059,31 +2121,23 @@ void IOP::Codec::TypeMismatch::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::IOP::Codec::TypeMismatch, 0); - return retval; -} - static const CORBA::Long _oc_IOP_EncodingFormat[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x466f726d), - ACE_NTOHL (0x61743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x61743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0 15, - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61740000), // name = EncodingFormat CORBA::tk_short, @@ -2099,7 +2153,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EncodingFormat, &_tc_TAO_tc_IOP_EncodingFormat) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EncodingFormat, &_tc_TAO_tc_IOP_EncodingFormat) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::Short) @@ -2110,54 +2164,54 @@ static const CORBA::Long _oc_IOP_Encoding[] = { TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/Encoding:1.0 9, - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), ACE_NTOHL (0x0), // name = Encoding 3, // member count 7, - ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x666f726d), ACE_NTOHL (0x61740000), // name = format CORBA::tk_alias, // typecode kind for typedefs 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x466f726d), - ACE_NTOHL (0x61743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x61743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0 15, - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61740000), // name = EncodingFormat CORBA::tk_short, 14, - ACE_NTOHL (0x6d616a6f), - ACE_NTOHL (0x725f7665), - ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x6d616a6f), + ACE_NTOHL (0x725f7665), + ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000), // name = major_version CORBA::tk_octet, 14, - ACE_NTOHL (0x6d696e6f), - ACE_NTOHL (0x725f7665), - ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x6d696e6f), + ACE_NTOHL (0x725f7665), + ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000), // name = minor_version CORBA::tk_octet, @@ -2173,12 +2227,12 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Encoding, &_tc_TAO_tc_IOP_Encoding) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Encoding, &_tc_TAO_tc_IOP_Encoding) TAO_NAMESPACE_END -void IOP::Encoding::_tao_any_destructor (void *x) +void IOP::Encoding::_tao_any_destructor (void *_tao_void_pointer) { - Encoding *tmp = ACE_static_cast (Encoding*,x); + Encoding *tmp = ACE_static_cast (Encoding*, _tao_void_pointer); delete tmp; } @@ -2227,9 +2281,10 @@ tao_IOP_CodecFactory_upcast ( return *tmp; } - // ************************************************************* -// Operations for class IOP::CodecFactory_var +// IOP::CodecFactory_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* IOP::CodecFactory_var::CodecFactory_var (void) // default constructor @@ -2276,7 +2331,7 @@ IOP::CodecFactory_var::operator const ::IOP::CodecFactory_ptr &() const // cast return this->ptr_; } -IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast +IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast { return this->ptr_; } @@ -2352,7 +2407,9 @@ IOP::CodecFactory_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class IOP::CodecFactory_out +// IOP::CodecFactory_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* IOP::CodecFactory_out::CodecFactory_out (CodecFactory_ptr &p) @@ -2411,12 +2468,12 @@ IOP::CodecFactory_out::operator-> (void) } -// default constructor -IOP::CodecFactory::CodecFactory () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +IOP::CodecFactory::CodecFactory (void) +{} -// destructor IOP::CodecFactory::~CodecFactory (void) {} @@ -2428,7 +2485,8 @@ IOP::CodecFactory_ptr IOP::CodecFactory::_narrow ( return CodecFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -IOP::CodecFactory_ptr IOP::CodecFactory::_unchecked_narrow ( +IOP::CodecFactory_ptr +IOP::CodecFactory::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -2468,7 +2526,7 @@ void *IOP::CodecFactory::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2504,7 +2562,6 @@ IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::Unknow return *this; } -// Narrow. IOP::CodecFactory::UnknownEncoding * IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *exc) { @@ -2518,6 +2575,25 @@ IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnknownEncoding, 0); + return retval; +} + +CORBA::Exception * +IOP::CodecFactory::UnknownEncoding::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + IOP::CodecFactory::UnknownEncoding (*this), + 0 + ); + return result; +} + void IOP::CodecFactory::UnknownEncoding::_raise () { TAO_RAISE (*this); @@ -2539,14 +2615,6 @@ void IOP::CodecFactory::UnknownEncoding::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnknownEncoding, 0); - return retval; -} - void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedProfile &_tao_elem) // copying { TAO_OutputCDR stream; @@ -2583,13 +2651,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2666,13 +2734,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_IOR ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2749,13 +2817,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2840,13 +2908,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleCompo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2931,13 +2999,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -3022,13 +3090,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -3105,13 +3173,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -3196,13 +3264,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -3286,13 +3354,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_t ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -3352,20 +3420,20 @@ CORBA::Boolean operator<< ( if (strm << _tao_sequence.length ()) { // encode all elements - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -3382,10 +3450,15 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (), ACE_Message_Block::DONT_DELETE)) @@ -3395,7 +3468,7 @@ CORBA::Boolean operator>> ( strm.orb_core ()->resource_factory ()-> input_cdr_allocator_type_locked () == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); @@ -3406,7 +3479,7 @@ CORBA::Boolean operator>> ( return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -3447,8 +3520,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) @@ -3474,20 +3552,20 @@ CORBA::Boolean operator<< ( if (strm << _tao_sequence.length ()) { // encode all elements - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -3504,10 +3582,15 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (), ACE_Message_Block::DONT_DELETE)) @@ -3517,7 +3600,7 @@ CORBA::Boolean operator>> ( strm.orb_core ()->resource_factory ()-> input_cdr_allocator_type_locked () == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); @@ -3528,7 +3611,7 @@ CORBA::Boolean operator>> ( return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -3565,8 +3648,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) @@ -3607,8 +3695,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) @@ -3649,8 +3742,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) @@ -3674,20 +3772,20 @@ CORBA::Boolean operator<< ( if (strm << _tao_sequence.length ()) { // encode all elements - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -3704,10 +3802,15 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (), ACE_Message_Block::DONT_DELETE)) @@ -3717,7 +3820,7 @@ CORBA::Boolean operator>> ( strm.orb_core ()->resource_factory ()-> input_cdr_allocator_type_locked () == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); @@ -3728,7 +3831,7 @@ CORBA::Boolean operator>> ( return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -3765,8 +3868,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) @@ -3777,3 +3885,4 @@ CORBA::Boolean operator>> ( } return 0; // error } + diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index 87393af40d0..7b646d00f2a 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -23,17 +23,16 @@ #define _TAO_IDL_ORIG_IOPC_H_ #include "ace/pre.h" -#include "TAO_Export.h" +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Any.h" -#include "Object.h" +#include "TAO_Export.h" #include "Exception.h" -#include "CDR.h" -#include "Sequence.h" +#include "Object.h" +#include "Any.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -58,15 +57,11 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -#if defined (IOR) -#undef IOR -#endif /* IOR */ - TAO_NAMESPACE IOP { typedef CORBA::ULong ProfileId; typedef CORBA::ULong_out ProfileId_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProfileId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProfileId; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_INTERNET_IOP; @@ -90,7 +85,6 @@ TAO_NAMESPACE IOP #define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_ class _tao_seq_Octet; - class _tao_seq_Octet_var; // ************************************************************* // _tao_seq_Octet @@ -98,29 +92,24 @@ TAO_NAMESPACE IOP class TAO_Export _tao_seq_Octet : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> + TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> + TAO_Unbounded_Sequence<CORBA::Octet> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_Octet (void); // default ctor _tao_seq_Octet (CORBA::ULong max); // uses max size _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, + CORBA::Boolean release = 0 + ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor ~_tao_seq_Octet (void); static void _tao_any_destructor (void*); -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_Octet_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) _tao_seq_Octet ( CORBA::ULong length, @@ -133,20 +122,22 @@ TAO_NAMESPACE IOP #endif /* end #if !defined */ + #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef _tao_seq_Octet _profile_data_seq; - #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ +#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + _tao_seq_Octet profile_data; - _tao_seq_Octet profile_data; }; class TAO_Export TaggedProfile_var { public: - TaggedProfile_var (void); // default constructor + TaggedProfile_var (void); TaggedProfile_var (TaggedProfile *); - TaggedProfile_var (const TaggedProfile_var &); // copy constructor - ~TaggedProfile_var (void); // destructor + TaggedProfile_var (const TaggedProfile_var &); + ~TaggedProfile_var (void); TaggedProfile_var &operator= (TaggedProfile *); TaggedProfile_var &operator= (const TaggedProfile_var &); @@ -156,7 +147,8 @@ TAO_NAMESPACE IOP operator const TaggedProfile &() const; operator TaggedProfile &(); operator TaggedProfile &() const; - operator TaggedProfile *&(); // variable-size types only + // Variable-size types only. + operator TaggedProfile *&(); // in, inout, out, _retn const TaggedProfile &in (void) const; @@ -183,11 +175,11 @@ TAO_NAMESPACE IOP private: TaggedProfile *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const TaggedProfile_var &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedProfile; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile; struct IOR; class IOR_var; @@ -208,37 +200,47 @@ TAO_NAMESPACE IOP #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); // Default constructor. - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum, + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile ( + CORBA::ULong maximum, CORBA::ULong length, ACE_NESTED_CLASS (IOP, TaggedProfile) *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &operator= (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs); - virtual ~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); // Dtor. - // = Accessors. - ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i); - const ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i) const; - // = Static operations. - static ACE_NESTED_CLASS (IOP, TaggedProfile) *allocbuf (CORBA::ULong size); - static void freebuf (ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (CORBA::Boolean orphan = 0); - const ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (void) const; - void replace (CORBA::ULong max, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile ( + const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs + ); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &operator= ( + const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs + ); + virtual ~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); + + // = Accessors. + ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i); + const ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i) const; + + // = Static operations. + static ACE_NESTED_CLASS (IOP, TaggedProfile) *allocbuf (CORBA::ULong size); + static void freebuf (ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (CORBA::Boolean orphan = 0); + const ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (void) const; + void replace ( + CORBA::ULong max, CORBA::ULong length, ACE_NESTED_CLASS (IOP, TaggedProfile) *data, - CORBA::Boolean release); - }; + CORBA::Boolean release + ); + }; #endif /* end #if !defined */ @@ -249,7 +251,6 @@ TAO_NAMESPACE IOP #define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_ class _tao_seq_TaggedProfile; - class _tao_seq_TaggedProfile_var; // ************************************************************* // _tao_seq_TaggedProfile @@ -257,46 +258,44 @@ TAO_NAMESPACE IOP class TAO_Export _tao_seq_TaggedProfile : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<ACE_NESTED_CLASS (IOP, TaggedProfile)> + TAO_Unbounded_Sequence<ACE_NESTED_CLASS (IOP, TaggedProfile)> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_TaggedProfile (void); // default ctor _tao_seq_TaggedProfile (CORBA::ULong max); // uses max size _tao_seq_TaggedProfile ( - CORBA::ULong max, - CORBA::ULong length, - ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer, + CORBA::Boolean release = 0 + ); _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); // copy ctor ~_tao_seq_TaggedProfile (void); static void _tao_any_destructor (void*); -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_TaggedProfile_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - }; #endif /* end #if !defined */ + #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef _tao_seq_TaggedProfile _profiles_seq; - #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ +#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + _tao_seq_TaggedProfile profiles; - _tao_seq_TaggedProfile profiles; }; class TAO_Export IOR_var { public: - IOR_var (void); // default constructor + IOR_var (void); IOR_var (IOR *); - IOR_var (const IOR_var &); // copy constructor - ~IOR_var (void); // destructor + IOR_var (const IOR_var &); + ~IOR_var (void); IOR_var &operator= (IOR *); IOR_var &operator= (const IOR_var &); @@ -306,7 +305,8 @@ TAO_NAMESPACE IOP operator const IOR &() const; operator IOR &(); operator IOR &() const; - operator IOR *&(); // variable-size types only + // Variable-size types only. + operator IOR *&(); // in, inout, out, _retn const IOR &in (void) const; @@ -333,15 +333,15 @@ TAO_NAMESPACE IOP private: IOR *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const IOR_var &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IOR; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR; typedef CORBA::ULong ComponentId; typedef CORBA::ULong_out ComponentId_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentId; struct TaggedComponent; class TaggedComponent_var; @@ -361,7 +361,6 @@ TAO_NAMESPACE IOP #define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_ class _tao_seq_Octet; - class _tao_seq_Octet_var; // ************************************************************* // _tao_seq_Octet @@ -369,29 +368,24 @@ TAO_NAMESPACE IOP class TAO_Export _tao_seq_Octet : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> + TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> + TAO_Unbounded_Sequence<CORBA::Octet> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_Octet (void); // default ctor _tao_seq_Octet (CORBA::ULong max); // uses max size _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, + CORBA::Boolean release = 0 + ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor ~_tao_seq_Octet (void); static void _tao_any_destructor (void*); -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_Octet_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) _tao_seq_Octet ( CORBA::ULong length, @@ -404,20 +398,22 @@ TAO_NAMESPACE IOP #endif /* end #if !defined */ + #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef _tao_seq_Octet _component_data_seq; - #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ +#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + _tao_seq_Octet component_data; - _tao_seq_Octet component_data; }; class TAO_Export TaggedComponent_var { public: - TaggedComponent_var (void); // default constructor + TaggedComponent_var (void); TaggedComponent_var (TaggedComponent *); - TaggedComponent_var (const TaggedComponent_var &); // copy constructor - ~TaggedComponent_var (void); // destructor + TaggedComponent_var (const TaggedComponent_var &); + ~TaggedComponent_var (void); TaggedComponent_var &operator= (TaggedComponent *); TaggedComponent_var &operator= (const TaggedComponent_var &); @@ -427,7 +423,8 @@ TAO_NAMESPACE IOP operator const TaggedComponent &() const; operator TaggedComponent &(); operator TaggedComponent &() const; - operator TaggedComponent *&(); // variable-size types only + // Variable-size types only. + operator TaggedComponent *&(); // in, inout, out, _retn const TaggedComponent &in (void) const; @@ -454,11 +451,11 @@ TAO_NAMESPACE IOP private: TaggedComponent *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const TaggedComponent_var &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponent; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -466,37 +463,47 @@ TAO_NAMESPACE IOP #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); // Default constructor. - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum, + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile ( + CORBA::ULong maximum, CORBA::ULong length, TaggedComponent *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &operator= (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs); - virtual ~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); // Dtor. - // = Accessors. - TaggedComponent &operator[] (CORBA::ULong i); - const TaggedComponent &operator[] (CORBA::ULong i) const; - // = Static operations. - static TaggedComponent *allocbuf (CORBA::ULong size); - static void freebuf (TaggedComponent *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); - const TaggedComponent *get_buffer (void) const; - void replace (CORBA::ULong max, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile ( + const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs + ); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &operator= ( + const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs + ); + virtual ~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); + + // = Accessors. + TaggedComponent &operator[] (CORBA::ULong i); + const TaggedComponent &operator[] (CORBA::ULong i) const; + + // = Static operations. + static TaggedComponent *allocbuf (CORBA::ULong size); + static void freebuf (TaggedComponent *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); + const TaggedComponent *get_buffer (void) const; + void replace ( + CORBA::ULong max, CORBA::ULong length, TaggedComponent *data, - CORBA::Boolean release); - }; + CORBA::Boolean release + ); + }; #endif /* end #if !defined */ @@ -515,20 +522,20 @@ TAO_NAMESPACE IOP class TAO_Export MultipleComponentProfile : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TaggedComponent> + TAO_Unbounded_Sequence<TaggedComponent> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: MultipleComponentProfile (void); // default ctor MultipleComponentProfile (CORBA::ULong max); // uses max size MultipleComponentProfile ( - CORBA::ULong max, - CORBA::ULong length, - TaggedComponent *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + TaggedComponent *buffer, + CORBA::Boolean release = 0 + ); MultipleComponentProfile (const MultipleComponentProfile &); // copy ctor ~MultipleComponentProfile (void); static void _tao_any_destructor (void*); @@ -537,6 +544,7 @@ TAO_NAMESPACE IOP typedef MultipleComponentProfile_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ + }; #endif /* end #if !defined */ @@ -552,10 +560,10 @@ TAO_NAMESPACE IOP class TAO_Export MultipleComponentProfile_var { public: - MultipleComponentProfile_var (void); // default constructor + MultipleComponentProfile_var (void); MultipleComponentProfile_var (MultipleComponentProfile *); - MultipleComponentProfile_var (const MultipleComponentProfile_var &); // copy constructor - ~MultipleComponentProfile_var (void); // destructor + MultipleComponentProfile_var (const MultipleComponentProfile_var &); + ~MultipleComponentProfile_var (void); MultipleComponentProfile_var &operator= (MultipleComponentProfile *); MultipleComponentProfile_var &operator= (const MultipleComponentProfile_var &); @@ -603,14 +611,14 @@ TAO_NAMESPACE IOP private: MultipleComponentProfile *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const MultipleComponentProfile_var &); }; #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MultipleComponentProfile; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -618,37 +626,47 @@ TAO_NAMESPACE IOP #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentList : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); // Default constructor. - _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum, + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentList + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList ( + CORBA::ULong maximum, CORBA::ULong length, TaggedComponent *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList &operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs); - virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); // Dtor. - // = Accessors. - TaggedComponent &operator[] (CORBA::ULong i); - const TaggedComponent &operator[] (CORBA::ULong i) const; - // = Static operations. - static TaggedComponent *allocbuf (CORBA::ULong size); - static void freebuf (TaggedComponent *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); - const TaggedComponent *get_buffer (void) const; - void replace (CORBA::ULong max, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList ( + const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs + ); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList &operator= ( + const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs + ); + virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); + + // = Accessors. + TaggedComponent &operator[] (CORBA::ULong i); + const TaggedComponent &operator[] (CORBA::ULong i) const; + + // = Static operations. + static TaggedComponent *allocbuf (CORBA::ULong size); + static void freebuf (TaggedComponent *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); + const TaggedComponent *get_buffer (void) const; + void replace ( + CORBA::ULong max, CORBA::ULong length, TaggedComponent *data, - CORBA::Boolean release); - }; + CORBA::Boolean release + ); + }; #endif /* end #if !defined */ @@ -667,20 +685,20 @@ TAO_NAMESPACE IOP class TAO_Export TaggedComponentList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentList + _TAO_Unbounded_Sequence_IOP_TaggedComponentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TaggedComponent> + TAO_Unbounded_Sequence<TaggedComponent> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: TaggedComponentList (void); // default ctor TaggedComponentList (CORBA::ULong max); // uses max size TaggedComponentList ( - CORBA::ULong max, - CORBA::ULong length, - TaggedComponent *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + TaggedComponent *buffer, + CORBA::Boolean release = 0 + ); TaggedComponentList (const TaggedComponentList &); // copy ctor ~TaggedComponentList (void); static void _tao_any_destructor (void*); @@ -689,6 +707,7 @@ TAO_NAMESPACE IOP typedef TaggedComponentList_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ + }; #endif /* end #if !defined */ @@ -704,10 +723,10 @@ TAO_NAMESPACE IOP class TAO_Export TaggedComponentList_var { public: - TaggedComponentList_var (void); // default constructor + TaggedComponentList_var (void); TaggedComponentList_var (TaggedComponentList *); - TaggedComponentList_var (const TaggedComponentList_var &); // copy constructor - ~TaggedComponentList_var (void); // destructor + TaggedComponentList_var (const TaggedComponentList_var &); + ~TaggedComponentList_var (void); TaggedComponentList_var &operator= (TaggedComponentList *); TaggedComponentList_var &operator= (const TaggedComponentList_var &); @@ -755,14 +774,14 @@ TAO_NAMESPACE IOP private: TaggedComponentList *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const TaggedComponentList_var &); }; #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponentList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -770,37 +789,47 @@ TAO_NAMESPACE IOP #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); // Default constructor. - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum, + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq ( + CORBA::ULong maximum, CORBA::ULong length, TaggedComponent *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs); - virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); // Dtor. - // = Accessors. - TaggedComponent &operator[] (CORBA::ULong i); - const TaggedComponent &operator[] (CORBA::ULong i) const; - // = Static operations. - static TaggedComponent *allocbuf (CORBA::ULong size); - static void freebuf (TaggedComponent *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); - const TaggedComponent *get_buffer (void) const; - void replace (CORBA::ULong max, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq ( + const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs + ); + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &operator= ( + const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs + ); + virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); + + // = Accessors. + TaggedComponent &operator[] (CORBA::ULong i); + const TaggedComponent &operator[] (CORBA::ULong i) const; + + // = Static operations. + static TaggedComponent *allocbuf (CORBA::ULong size); + static void freebuf (TaggedComponent *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); + const TaggedComponent *get_buffer (void) const; + void replace ( + CORBA::ULong max, CORBA::ULong length, TaggedComponent *data, - CORBA::Boolean release); - }; + CORBA::Boolean release + ); + }; #endif /* end #if !defined */ @@ -819,20 +848,20 @@ TAO_NAMESPACE IOP class TAO_Export TaggedComponentSeq : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TaggedComponent> + TAO_Unbounded_Sequence<TaggedComponent> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: TaggedComponentSeq (void); // default ctor TaggedComponentSeq (CORBA::ULong max); // uses max size TaggedComponentSeq ( - CORBA::ULong max, - CORBA::ULong length, - TaggedComponent *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + TaggedComponent *buffer, + CORBA::Boolean release = 0 + ); TaggedComponentSeq (const TaggedComponentSeq &); // copy ctor ~TaggedComponentSeq (void); static void _tao_any_destructor (void*); @@ -841,6 +870,7 @@ TAO_NAMESPACE IOP typedef TaggedComponentSeq_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ + }; #endif /* end #if !defined */ @@ -856,10 +886,10 @@ TAO_NAMESPACE IOP class TAO_Export TaggedComponentSeq_var { public: - TaggedComponentSeq_var (void); // default constructor + TaggedComponentSeq_var (void); TaggedComponentSeq_var (TaggedComponentSeq *); - TaggedComponentSeq_var (const TaggedComponentSeq_var &); // copy constructor - ~TaggedComponentSeq_var (void); // destructor + TaggedComponentSeq_var (const TaggedComponentSeq_var &); + ~TaggedComponentSeq_var (void); TaggedComponentSeq_var &operator= (TaggedComponentSeq *); TaggedComponentSeq_var &operator= (const TaggedComponentSeq_var &); @@ -907,14 +937,14 @@ TAO_NAMESPACE IOP private: TaggedComponentSeq *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const TaggedComponentSeq_var &); }; #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponentSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ORB_TYPE; @@ -938,7 +968,7 @@ TAO_NAMESPACE IOP typedef CORBA::ULong ServiceId; typedef CORBA::ULong_out ServiceId_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceId; struct ServiceContext; class ServiceContext_var; @@ -958,7 +988,6 @@ TAO_NAMESPACE IOP #define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_ class _tao_seq_Octet; - class _tao_seq_Octet_var; // ************************************************************* // _tao_seq_Octet @@ -966,29 +995,24 @@ TAO_NAMESPACE IOP class TAO_Export _tao_seq_Octet : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> + TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> + TAO_Unbounded_Sequence<CORBA::Octet> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_Octet (void); // default ctor _tao_seq_Octet (CORBA::ULong max); // uses max size _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, + CORBA::Boolean release = 0 + ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor ~_tao_seq_Octet (void); static void _tao_any_destructor (void*); -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_Octet_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) _tao_seq_Octet ( CORBA::ULong length, @@ -1001,20 +1025,22 @@ TAO_NAMESPACE IOP #endif /* end #if !defined */ + #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef _tao_seq_Octet _context_data_seq; - #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ +#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + _tao_seq_Octet context_data; - _tao_seq_Octet context_data; }; class TAO_Export ServiceContext_var { public: - ServiceContext_var (void); // default constructor + ServiceContext_var (void); ServiceContext_var (ServiceContext *); - ServiceContext_var (const ServiceContext_var &); // copy constructor - ~ServiceContext_var (void); // destructor + ServiceContext_var (const ServiceContext_var &); + ~ServiceContext_var (void); ServiceContext_var &operator= (ServiceContext *); ServiceContext_var &operator= (const ServiceContext_var &); @@ -1024,7 +1050,8 @@ TAO_NAMESPACE IOP operator const ServiceContext &() const; operator ServiceContext &(); operator ServiceContext &() const; - operator ServiceContext *&(); // variable-size types only + // Variable-size types only. + operator ServiceContext *&(); // in, inout, out, _retn const ServiceContext &in (void) const; @@ -1051,11 +1078,11 @@ TAO_NAMESPACE IOP private: ServiceContext *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const ServiceContext_var &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceContext; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -1063,37 +1090,47 @@ TAO_NAMESPACE IOP #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_ServiceContextList : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_IOP_ServiceContextList (void); // Default constructor. - _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum, + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_ServiceContextList + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_IOP_ServiceContextList (void); + _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_ServiceContextList ( + CORBA::ULong maximum, CORBA::ULong length, ServiceContext *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_IOP_ServiceContextList (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs); - _TAO_Unbounded_Sequence_IOP_ServiceContextList &operator= (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs); - virtual ~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void); // Dtor. - // = Accessors. - ServiceContext &operator[] (CORBA::ULong i); - const ServiceContext &operator[] (CORBA::ULong i) const; - // = Static operations. - static ServiceContext *allocbuf (CORBA::ULong size); - static void freebuf (ServiceContext *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - ServiceContext *get_buffer (CORBA::Boolean orphan = 0); - const ServiceContext *get_buffer (void) const; - void replace (CORBA::ULong max, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_IOP_ServiceContextList ( + const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs + ); + _TAO_Unbounded_Sequence_IOP_ServiceContextList &operator= ( + const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs + ); + virtual ~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void); + + // = Accessors. + ServiceContext &operator[] (CORBA::ULong i); + const ServiceContext &operator[] (CORBA::ULong i) const; + + // = Static operations. + static ServiceContext *allocbuf (CORBA::ULong size); + static void freebuf (ServiceContext *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + ServiceContext *get_buffer (CORBA::Boolean orphan = 0); + const ServiceContext *get_buffer (void) const; + void replace ( + CORBA::ULong max, CORBA::ULong length, ServiceContext *data, - CORBA::Boolean release); - }; + CORBA::Boolean release + ); + }; #endif /* end #if !defined */ @@ -1112,20 +1149,20 @@ TAO_NAMESPACE IOP class TAO_Export ServiceContextList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_ServiceContextList + _TAO_Unbounded_Sequence_IOP_ServiceContextList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<ServiceContext> + TAO_Unbounded_Sequence<ServiceContext> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: ServiceContextList (void); // default ctor ServiceContextList (CORBA::ULong max); // uses max size ServiceContextList ( - CORBA::ULong max, - CORBA::ULong length, - ServiceContext *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + ServiceContext *buffer, + CORBA::Boolean release = 0 + ); ServiceContextList (const ServiceContextList &); // copy ctor ~ServiceContextList (void); static void _tao_any_destructor (void*); @@ -1134,6 +1171,7 @@ TAO_NAMESPACE IOP typedef ServiceContextList_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ + }; #endif /* end #if !defined */ @@ -1149,10 +1187,10 @@ TAO_NAMESPACE IOP class TAO_Export ServiceContextList_var { public: - ServiceContextList_var (void); // default constructor + ServiceContextList_var (void); ServiceContextList_var (ServiceContextList *); - ServiceContextList_var (const ServiceContextList_var &); // copy constructor - ~ServiceContextList_var (void); // destructor + ServiceContextList_var (const ServiceContextList_var &); + ~ServiceContextList_var (void); ServiceContextList_var &operator= (ServiceContextList *); ServiceContextList_var &operator= (const ServiceContextList_var &); @@ -1200,14 +1238,14 @@ TAO_NAMESPACE IOP private: ServiceContextList *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const ServiceContextList_var &); }; #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceContextList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContextList; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TransactionService; @@ -1241,6 +1279,12 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong FT_REQUEST; + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_UIPMC; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GROUP; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GROUP_IIOP; + #if !defined (_IOP_CODEC___PTR_CH_) #define _IOP_CODEC___PTR_CH_ @@ -1280,7 +1324,10 @@ TAO_NAMESPACE IOP static Codec_ptr tao_duplicate (Codec_ptr); static void tao_release (Codec_ptr); static Codec_ptr tao_nil (void); - static Codec_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static Codec_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); private: @@ -1321,7 +1368,8 @@ TAO_NAMESPACE IOP #if !defined (_IOP_CODEC_CH_) #define _IOP_CODEC_CH_ -class TAO_Export Codec : public virtual CORBA_Object + class TAO_Export Codec + : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1329,22 +1377,25 @@ class TAO_Export Codec : public virtual CORBA_Object typedef Codec_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations - static Codec_ptr _duplicate (Codec_ptr obj); - static Codec_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + // The static operations. + static Codec_ptr _duplicate (Codec_ptr obj); - static Codec_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + static Codec_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); - static Codec_ptr _nil (void) - { - return (Codec_ptr)0; - } + static Codec_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static Codec_ptr _nil (void) + { + return (Codec_ptr)0; + } #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_) @@ -1355,16 +1406,16 @@ class TAO_Export Codec : public virtual CORBA_Object public: InvalidTypeForEncoding (void); - // Default constructor. - InvalidTypeForEncoding (const InvalidTypeForEncoding &); - // Copy constructor. - ~InvalidTypeForEncoding (void); - // Destructor. InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &); + static InvalidTypeForEncoding *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -1377,12 +1428,8 @@ class TAO_Export Codec : public virtual CORBA_Object ACE_ENV_ARG_DECL_NOT_USED ); - static InvalidTypeForEncoding *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception IOP::Codec::InvalidTypeForEncoding. + }; #endif /* end #if !defined */ @@ -1396,16 +1443,16 @@ class TAO_Export Codec : public virtual CORBA_Object public: FormatMismatch (void); - // Default constructor. - FormatMismatch (const FormatMismatch &); - // Copy constructor. - ~FormatMismatch (void); - // Destructor. FormatMismatch &operator= (const FormatMismatch &); + static FormatMismatch *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -1418,12 +1465,8 @@ class TAO_Export Codec : public virtual CORBA_Object ACE_ENV_ARG_DECL_NOT_USED ); - static FormatMismatch *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception IOP::Codec::FormatMismatch. + }; #endif /* end #if !defined */ @@ -1437,16 +1480,16 @@ class TAO_Export Codec : public virtual CORBA_Object public: TypeMismatch (void); - // Default constructor. - TypeMismatch (const TypeMismatch &); - // Copy constructor. - ~TypeMismatch (void); - // Destructor. TypeMismatch &operator= (const TypeMismatch &); + static TypeMismatch *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -1459,52 +1502,48 @@ class TAO_Export Codec : public virtual CORBA_Object ACE_ENV_ARG_DECL_NOT_USED ); - static TypeMismatch *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception IOP::Codec::TypeMismatch. + }; #endif /* end #if !defined */ - virtual CORBA::OctetSeq * encode ( + virtual ::CORBA::OctetSeq * encode ( const CORBA::Any & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - IOP::Codec::InvalidTypeForEncoding + CORBA::SystemException + , IOP::Codec::InvalidTypeForEncoding )) = 0; virtual CORBA::Any * decode ( const CORBA::OctetSeq & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - IOP::Codec::FormatMismatch + CORBA::SystemException + , IOP::Codec::FormatMismatch )) = 0; - virtual CORBA::OctetSeq * encode_value ( + virtual ::CORBA::OctetSeq * encode_value ( const CORBA::Any & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - IOP::Codec::InvalidTypeForEncoding + CORBA::SystemException + , IOP::Codec::InvalidTypeForEncoding )) = 0; virtual CORBA::Any * decode_value ( const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - IOP::Codec::FormatMismatch, - IOP::Codec::TypeMismatch + CORBA::SystemException + , IOP::Codec::FormatMismatch + , IOP::Codec::TypeMismatch )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1512,9 +1551,10 @@ class TAO_Export Codec : public virtual CORBA_Object virtual const char* _interface_repository_id (void) const; protected: - Codec (); + Codec (void); virtual ~Codec (void); + private: Codec (const Codec &); void operator= (const Codec &); @@ -1525,7 +1565,7 @@ class TAO_Export Codec : public virtual CORBA_Object typedef CORBA::Short EncodingFormat; typedef CORBA::Short_out EncodingFormat_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EncodingFormat; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ENCODING_CDR_ENCAPS; @@ -1544,20 +1584,23 @@ class TAO_Export Codec : public virtual CORBA_Object ACE_NESTED_CLASS (IOP, EncodingFormat) format; CORBA::Octet major_version; CORBA::Octet minor_version; + }; class TAO_Export Encoding_var { public: - Encoding_var (void); // default constructor + Encoding_var (void); Encoding_var (Encoding *); - Encoding_var (const Encoding_var &); // copy constructor - Encoding_var (const Encoding &); // fixed-size types only - ~Encoding_var (void); // destructor + Encoding_var (const Encoding_var &); + // Fixed-size types only. + Encoding_var (const Encoding &); + ~Encoding_var (void); Encoding_var &operator= (Encoding *); Encoding_var &operator= (const Encoding_var &); - Encoding_var &operator= (const Encoding &); // fixed-size types only + // Fixed-size types only. + Encoding_var &operator= (const Encoding &); Encoding *operator-> (void); const Encoding *operator-> (void) const; @@ -1578,7 +1621,7 @@ class TAO_Export Codec : public virtual CORBA_Object typedef Encoding &Encoding_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Encoding; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding; #if !defined (_IOP_CODECFACTORY___PTR_CH_) @@ -1619,7 +1662,10 @@ class TAO_Export Codec : public virtual CORBA_Object static CodecFactory_ptr tao_duplicate (CodecFactory_ptr); static void tao_release (CodecFactory_ptr); static CodecFactory_ptr tao_nil (void); - static CodecFactory_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static CodecFactory_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); private: @@ -1660,7 +1706,8 @@ class TAO_Export Codec : public virtual CORBA_Object #if !defined (_IOP_CODECFACTORY_CH_) #define _IOP_CODECFACTORY_CH_ -class TAO_Export CodecFactory : public virtual CORBA_Object + class TAO_Export CodecFactory + : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1668,22 +1715,25 @@ class TAO_Export CodecFactory : public virtual CORBA_Object typedef CodecFactory_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations - static CodecFactory_ptr _duplicate (CodecFactory_ptr obj); - static CodecFactory_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + // The static operations. + static CodecFactory_ptr _duplicate (CodecFactory_ptr obj); - static CodecFactory_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + static CodecFactory_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); - static CodecFactory_ptr _nil (void) - { - return (CodecFactory_ptr)0; - } + static CodecFactory_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static CodecFactory_ptr _nil (void) + { + return (CodecFactory_ptr)0; + } #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_) @@ -1694,16 +1744,16 @@ class TAO_Export CodecFactory : public virtual CORBA_Object public: UnknownEncoding (void); - // Default constructor. - UnknownEncoding (const UnknownEncoding &); - // Copy constructor. - ~UnknownEncoding (void); - // Destructor. UnknownEncoding &operator= (const UnknownEncoding &); + static UnknownEncoding *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -1716,23 +1766,19 @@ class TAO_Export CodecFactory : public virtual CORBA_Object ACE_ENV_ARG_DECL_NOT_USED ); - static UnknownEncoding *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception IOP::CodecFactory::UnknownEncoding. + }; #endif /* end #if !defined */ - virtual IOP::Codec_ptr create_codec ( + virtual ::IOP::Codec_ptr create_codec ( const IOP::Encoding & enc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding + CORBA::SystemException + , IOP::CodecFactory::UnknownEncoding )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1740,9 +1786,10 @@ class TAO_Export CodecFactory : public virtual CORBA_Object virtual const char* _interface_repository_id (void) const; protected: - CodecFactory (); + CodecFactory (void); virtual ~CodecFactory (void); + private: CodecFactory (const CodecFactory &); void operator= (const CodecFactory &); diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i index fecf25bbcac..d026f5cdcba 100644 --- a/TAO/tao/IOPC.i +++ b/TAO/tao/IOPC.i @@ -407,176 +407,176 @@ IOP::IOR_out::operator-> (void) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_ - // = Static operations. - ACE_INLINE IOP::TaggedProfile * - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - IOP::TaggedProfile *retval = 0; - ACE_NEW_RETURN (retval, IOP::TaggedProfile[size], 0); - return retval; - } - - ACE_INLINE void IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (IOP::TaggedProfile *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Default constructor. - { - } - - ACE_INLINE - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (maximum)) - { - } - - ACE_INLINE - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedProfile *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } - - ACE_INLINE - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - IOP::TaggedProfile *tmp1 = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->maximum_); - IOP::TaggedProfile * const tmp2 = ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } - - ACE_INLINE IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile & - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator= (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs) - // Assignment operator. +// = Static operations. +ACE_INLINE IOP::TaggedProfile * +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + IOP::TaggedProfile *retval = 0; + ACE_NEW_RETURN (retval, IOP::TaggedProfile[size], 0); + return retval; +} + +ACE_INLINE void IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (IOP::TaggedProfile *buffer) +// Free the sequence. +{ + delete [] buffer; +} + +ACE_INLINE +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Default constructor. +{ +} + +ACE_INLINE +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (maximum)) +{ +} + +ACE_INLINE +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum, + CORBA::ULong length, + IOP::TaggedProfile *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} + +ACE_INLINE +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::TaggedProfile *tmp1 = ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); + IOP::TaggedProfile *tmp1 = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->maximum_); IOP::TaggedProfile * const tmp2 = ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - return *this; + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE IOP::TaggedProfile & - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - IOP::TaggedProfile* tmp = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} + +ACE_INLINE IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile & +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator= (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; - ACE_INLINE const IOP::TaggedProfile & - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) const - // operator [] + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - IOP::TaggedProfile * const tmp = ACE_reinterpret_cast (IOP::TaggedProfile* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); - // Implement the TAO_Base_Sequence methods (see Sequence.h) + IOP::TaggedProfile *tmp1 = ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); + IOP::TaggedProfile * const tmp2 = ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_); - ACE_INLINE IOP::TaggedProfile * - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (CORBA::Boolean orphan) + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} + +// = Accessors. +ACE_INLINE IOP::TaggedProfile & +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::TaggedProfile* tmp = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); + return tmp[i]; +} + +ACE_INLINE const IOP::TaggedProfile & +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::TaggedProfile * const tmp = ACE_reinterpret_cast (IOP::TaggedProfile* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} + +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE IOP::TaggedProfile * +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (CORBA::Boolean orphan) +{ + IOP::TaggedProfile *result = 0; + if (orphan == 0) { - IOP::TaggedProfile *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_); } - return result; } - - ACE_INLINE const IOP::TaggedProfile * - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (void) const - { - return ACE_reinterpret_cast(const IOP::TaggedProfile * ACE_CAST_CONST, this->buffer_); - } - - ACE_INLINE void - IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::replace (CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedProfile *data, - CORBA::Boolean release) + else // if (orphan == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) + if (this->release_ != 0) { - IOP::TaggedProfile *tmp = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; } - this->buffer_ = data; - this->release_ = release; } - + return result; +} + +ACE_INLINE const IOP::TaggedProfile * +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (void) const +{ + return ACE_reinterpret_cast(const IOP::TaggedProfile * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::replace (CORBA::ULong max, +CORBA::ULong length, +IOP::TaggedProfile *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::TaggedProfile *tmp = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; +} + #endif /* end #if !defined */ @@ -776,176 +776,176 @@ IOP::TaggedComponent_out::operator-> (void) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CI_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CI_ - // = Static operations. - ACE_INLINE IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - IOP::TaggedComponent *retval = 0; - ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); - return retval; - } - - ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (IOP::TaggedComponent *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Default constructor. - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (maximum)) - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->maximum_); - IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } - - ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile & - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator= (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs) - // Assignment operator. +// = Static operations. +ACE_INLINE IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + IOP::TaggedComponent *retval = 0; + ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); + return retval; +} + +ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (IOP::TaggedComponent *buffer) +// Free the sequence. +{ + delete [] buffer; +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Default constructor. +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (maximum)) +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->maximum_); IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - return *this; + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE IOP::TaggedComponent & - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} + +ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile & +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator= (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; - ACE_INLINE const IOP::TaggedComponent & - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) const - // operator [] + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); - // Implement the TAO_Base_Sequence methods (see Sequence.h) + IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - ACE_INLINE IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (CORBA::Boolean orphan) + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} + +// = Accessors. +ACE_INLINE IOP::TaggedComponent & +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + return tmp[i]; +} + +ACE_INLINE const IOP::TaggedComponent & +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} + +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (CORBA::Boolean orphan) +{ + IOP::TaggedComponent *result = 0; + if (orphan == 0) { - IOP::TaggedComponent *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); } - return result; - } - - ACE_INLINE const IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (void) const - { - return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); } - - ACE_INLINE void - IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::replace (CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release) + else // if (orphan == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) + if (this->release_ != 0) { - IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; } - this->buffer_ = data; - this->release_ = release; } - + return result; +} + +ACE_INLINE const IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (void) const +{ + return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::replace (CORBA::ULong max, +CORBA::ULong length, +IOP::TaggedComponent *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; +} + #endif /* end #if !defined */ @@ -1170,176 +1170,176 @@ IOP::MultipleComponentProfile_out::operator[] (CORBA::ULong index) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CI_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CI_ - // = Static operations. - ACE_INLINE IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - IOP::TaggedComponent *retval = 0; - ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); - return retval; - } - - ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (IOP::TaggedComponent *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Default constructor. - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (maximum)) - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->maximum_); - IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } - - ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList & - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs) - // Assignment operator. +// = Static operations. +ACE_INLINE IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + IOP::TaggedComponent *retval = 0; + ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); + return retval; +} + +ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (IOP::TaggedComponent *buffer) +// Free the sequence. +{ + delete [] buffer; +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Default constructor. +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (maximum)) +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->maximum_); IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - return *this; + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE IOP::TaggedComponent & - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} + +ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList & +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; - ACE_INLINE const IOP::TaggedComponent & - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) const - // operator [] + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_); - // Implement the TAO_Base_Sequence methods (see Sequence.h) + TAO_Unbounded_Base_Sequence::operator= (rhs); - ACE_INLINE IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (CORBA::Boolean orphan) + IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} + +// = Accessors. +ACE_INLINE IOP::TaggedComponent & +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + return tmp[i]; +} + +ACE_INLINE const IOP::TaggedComponent & +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} + +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (CORBA::Boolean orphan) +{ + IOP::TaggedComponent *result = 0; + if (orphan == 0) { - IOP::TaggedComponent *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); } - return result; - } - - ACE_INLINE const IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (void) const - { - return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); } - - ACE_INLINE void - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::replace (CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release) + else // if (orphan == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) + if (this->release_ != 0) { - IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; } - this->buffer_ = data; - this->release_ = release; } - + return result; +} + +ACE_INLINE const IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (void) const +{ + return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::replace (CORBA::ULong max, +CORBA::ULong length, +IOP::TaggedComponent *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; +} + #endif /* end #if !defined */ @@ -1564,176 +1564,176 @@ IOP::TaggedComponentList_out::operator[] (CORBA::ULong index) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CI_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CI_ - // = Static operations. - ACE_INLINE IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - IOP::TaggedComponent *retval = 0; - ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); - return retval; - } - - ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (IOP::TaggedComponent *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Default constructor. - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (maximum)) - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->maximum_); - IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } - - ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq & - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs) - // Assignment operator. +// = Static operations. +ACE_INLINE IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + IOP::TaggedComponent *retval = 0; + ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); + return retval; +} + +ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (IOP::TaggedComponent *buffer) +// Free the sequence. +{ + delete [] buffer; +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Default constructor. +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (maximum)) +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->maximum_); IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - return *this; + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE IOP::TaggedComponent & - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} + +ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq & +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; - ACE_INLINE const IOP::TaggedComponent & - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i) const - // operator [] + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); - // Implement the TAO_Base_Sequence methods (see Sequence.h) + IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - ACE_INLINE IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (CORBA::Boolean orphan) + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} + +// = Accessors. +ACE_INLINE IOP::TaggedComponent & +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + return tmp[i]; +} + +ACE_INLINE const IOP::TaggedComponent & +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} + +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (CORBA::Boolean orphan) +{ + IOP::TaggedComponent *result = 0; + if (orphan == 0) { - IOP::TaggedComponent *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); } - return result; } - - ACE_INLINE const IOP::TaggedComponent * - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (void) const + else // if (orphan == 1) { - return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); - } - - ACE_INLINE void - IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::replace (CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release) - { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) + if (this->release_ != 0) { - IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; } - this->buffer_ = data; - this->release_ = release; } - + return result; +} + +ACE_INLINE const IOP::TaggedComponent * +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (void) const +{ + return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::replace (CORBA::ULong max, +CORBA::ULong length, +IOP::TaggedComponent *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; +} + #endif /* end #if !defined */ @@ -2151,176 +2151,176 @@ IOP::ServiceContext_out::operator-> (void) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CI_) #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CI_ - // = Static operations. - ACE_INLINE IOP::ServiceContext * - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - IOP::ServiceContext *retval = 0; - ACE_NEW_RETURN (retval, IOP::ServiceContext[size], 0); - return retval; - } - - ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (IOP::ServiceContext *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Default constructor. - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (maximum)) - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum, - CORBA::ULong length, - IOP::ServiceContext *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } - - ACE_INLINE - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - IOP::ServiceContext *tmp1 = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->maximum_); - IOP::ServiceContext * const tmp2 = ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } - - ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList & - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator= (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs) - // Assignment operator. +// = Static operations. +ACE_INLINE IOP::ServiceContext * +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + IOP::ServiceContext *retval = 0; + ACE_NEW_RETURN (retval, IOP::ServiceContext[size], 0); + return retval; +} + +ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (IOP::ServiceContext *buffer) +// Free the sequence. +{ + delete [] buffer; +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Default constructor. +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (maximum)) +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum, + CORBA::ULong length, + IOP::ServiceContext *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} + +ACE_INLINE +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::ServiceContext *tmp1 = ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); + IOP::ServiceContext *tmp1 = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->maximum_); IOP::ServiceContext * const tmp2 = ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - return *this; + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE IOP::ServiceContext & - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - IOP::ServiceContext* tmp = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} + +ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList & +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator= (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; - ACE_INLINE const IOP::ServiceContext & - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) const - // operator [] + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - IOP::ServiceContext * const tmp = ACE_reinterpret_cast (IOP::ServiceContext* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); - // Implement the TAO_Base_Sequence methods (see Sequence.h) + IOP::ServiceContext *tmp1 = ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); + IOP::ServiceContext * const tmp2 = ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_); - ACE_INLINE IOP::ServiceContext * - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (CORBA::Boolean orphan) + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} + +// = Accessors. +ACE_INLINE IOP::ServiceContext & +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::ServiceContext* tmp = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); + return tmp[i]; +} + +ACE_INLINE const IOP::ServiceContext & +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + IOP::ServiceContext * const tmp = ACE_reinterpret_cast (IOP::ServiceContext* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} + +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE IOP::ServiceContext * +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (CORBA::Boolean orphan) +{ + IOP::ServiceContext *result = 0; + if (orphan == 0) { - IOP::ServiceContext *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_); } - return result; - } - - ACE_INLINE const IOP::ServiceContext * - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (void) const - { - return ACE_reinterpret_cast(const IOP::ServiceContext * ACE_CAST_CONST, this->buffer_); } - - ACE_INLINE void - IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::replace (CORBA::ULong max, - CORBA::ULong length, - IOP::ServiceContext *data, - CORBA::Boolean release) + else // if (orphan == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) + if (this->release_ != 0) { - IOP::ServiceContext *tmp = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); - _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; } - this->buffer_ = data; - this->release_ = release; } - + return result; +} + +ACE_INLINE const IOP::ServiceContext * +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (void) const +{ + return ACE_reinterpret_cast(const IOP::ServiceContext * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::replace (CORBA::ULong max, +CORBA::ULong length, +IOP::ServiceContext *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::ServiceContext *tmp = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; +} + #endif /* end #if !defined */ @@ -2560,7 +2560,6 @@ IOP::ServiceContextList_out::operator[] (CORBA::ULong index) #define _IOP_CODEC___CI_ - #endif /* end #if !defined */ // ************************************************************* @@ -2716,6 +2715,7 @@ IOP::Encoding_var::ptr (void) const #if !defined (_IOP_CODECFACTORY___CI_) #define _IOP_CODECFACTORY___CI_ + #endif /* end #if !defined */ diff --git a/TAO/tao/IOP_N.pidl b/TAO/tao/IOP_N.pidl deleted file mode 100644 index e9fd1bfcc93..00000000000 --- a/TAO/tao/IOP_N.pidl +++ /dev/null @@ -1,56 +0,0 @@ -// -*- IDL -*- -// $Id$ - -// The following is from 99-12-04 Portable Interceptors spec. -// File: IOP_N.idl -// These definitions are intended to be added to the IOP module in -// version "N" of CORBA. At that time, all references to the IOP_N -// module should be changed appropriately and this file should not -// be separate from <IOP.idl>. - -#ifndef _IOP_N_IDL_ -#define _IOP_N_IDL_ - -#ifndef CORBA3 -#define local -#endif - -#include <orb.idl> -#include <IOP.pidl> // .idl in the spec - -module IOP_N { - -// Commented this out as shalnt due with it in the vanilla round. - - typedef sequence<IOP::TaggedComponent> TaggedComponentSeq; - - local interface Codec { - exception InvalidTypeForEncoding {}; - exception FormatMismatch {}; - exception TypeMismatch {}; - - CORBA::OctetSeq encode (in any data) raises (InvalidTypeForEncoding); - any decode (in CORBA::OctetSeq data) raises (FormatMismatch); - CORBA::OctetSeq encode_value (in any data) raises (InvalidTypeForEncoding); - any decode_value (in CORBA::OctetSeq data, in CORBA::TypeCode tc) - raises (FormatMismatch, TypeMismatch); - }; - - typedef short EncodingFormat; - const EncodingFormat ENCODING_CDR_ENCAPS = 0; - - struct Encoding { - EncodingFormat format; - octet major_version; - octet minor_version; - }; - - local interface CodecFactory { - exception UnknownEncoding {}; - - Codec create_codec (in Encoding enc) raises (UnknownEncoding); - }; - -}; - -#endif // _IOP_N_IDL_ diff --git a/TAO/tao/IOR.pidl b/TAO/tao/IORManipulation/IOR.pidl index cd6c1bc33cc..f9084893267 100644 --- a/TAO/tao/IOR.pidl +++ b/TAO/tao/IORManipulation/IOR.pidl @@ -1,39 +1,79 @@ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// XXX -// -// = DESCRIPTION -// This file was used to generate the code in IORManipulation/IORC.{h,i,cpp} -// The code is then hand-crafted to compile it inside the ORB, avoid -// cyclic dependencies and enforce the locality constraints on -// certain objects. -// Can be compiled using $TAO_ROOT/TAO_IDL/tao_idl -Ge 1 -// -I$(TAO_ROOT) \ -// -Wb,export_macro=TAO_IORManip_Export \ -// IOR.idl -// ================================================================ +/** + * @file IOR.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the TAO_IOP namespace. + * + * This file was used to generate the code in IORC.{h,i,cpp}. + * + * To regenerate the code use: + * + * tao_idl \ + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 \ + * -Wb,export_macro=TAO_IORManip_Export \ + * -Wb,export_include="ior_manip_export.h" \ + * -Wb,pre_include="ace/pre.h" \ + * -Wb,post_include="ace/post.h" \ + * IOR.idl + * + */ + +#ifndef TAO_IOR_PIDL +#define TAO_IOR_PIDL module TAO_IOP { + /** + * @exception EmptyProfileList + * + * @brief @@ Bala, please describe this exception + */ exception EmptyProfileList {}; + + /** + * @exception NotFound + * + * @brief @@ Bala, please describe this exception + */ exception NotFound {}; + + /** + * @exception Duplicate + * + * @brief @@ Bala, please describe this exception + */ exception Duplicate {}; + + /** + * @exception Invalid_IOR + * + * @brief @@ Bala, please describe this exception + */ exception Invalid_IOR {}; + + /** + * @exception MultiProfileList + * + * @brief @@ Bala, please describe this exception + */ exception MultiProfileList {}; - local interface TAO_IOR_Property - { - // Allows setting properties by the different services in the - // IOR. The implementations of this interface would reside in - // the services. This interface essentially performs a role of - // a callback object. + /** + * @interface TAO_IOR_Property + * + * Allows setting properties by the different services in the + * IOR. The implementations of this interface would reside in the + * services. This interface essentially performs a role of a + * callback object. + * + * @todo This interface seems redundant in the face of the + * PortableInterceptor::IORInterceptor and the + * ObjectReferenceTemplate. If that is the case we should deprecate + * it and remove it. + */ + local interface TAO_IOR_Property + { boolean set_property (in Object ior) raises (Invalid_IOR); // Operation that would set the required properties in the <ior> @@ -53,22 +93,27 @@ module TAO_IOP boolean is_primary_set (in Object ior); // Returns a true or false depending on whether a primary member // has been set in <ior> - }; - + }; + + /** + * @interface TAO_IOR_Manipulation + * + * @brief Allows applications to manipulate object references. + * + * Manipulating Object References. While this interface does not + * assume the use of CORBA complient IOPs, the IOP termonology is + * used throughout. + * Object references (Object) are used since they encapsulate the + * notion of object references and IORs. + * Note, an IOR contains one or more profiles and a profile can be + * considered to represent the location or route to a specific instance + * of an object. + * A profile may also contain supplimentary information useful for + * differrent services such as security. + * All Object references may have multiple profiles + */ local interface TAO_IOR_Manipulation - { - // Manipulating Object References. While this interface does not - // assume the use of CORBA complient IOPs, the IOP termonology is - // used throughout. - // Object references (Object) are used since they encapsulate the - // notion of object references and IORs. - // Note, an IOR contains one or more profiles and a profile can be - // considered to represent the location or route to a specific instance - // of an object. - // A profile may also contain supplimentary information useful for - // differrent services such as security. - // All Object references may have multiple profiles - + { typedef sequence <Object> IORList; Object merge_iors (in IORList iors) @@ -139,8 +184,7 @@ module TAO_IOP raises (EmptyProfileList); // This will return the number of profiles contained in the // corresponding object reference for this object. - - - - }; + }; }; + +#endif /* TAO_IOR_PIDL */ diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index 6432a6ef17f..a49cc3789cd 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -20,12 +20,19 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "IORManip_Loader.h" -#include "tao/Typecode.h" -#include "tao/Any.h" -#include "tao/ORB.h" + +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) @@ -43,12 +50,6 @@ TAO_IOP::EmptyProfileList::~EmptyProfileList (void) { } -void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *x) -{ - EmptyProfileList *tmp = ACE_static_cast (EmptyProfileList*,x); - delete tmp; -} - // Copy constructor. TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -63,7 +64,12 @@ TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_ex return *this; } -// Narrow. +void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer) +{ + EmptyProfileList *tmp = ACE_static_cast (EmptyProfileList*, _tao_void_pointer); + delete tmp; +} + TAO_IOP::EmptyProfileList * TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *exc) { @@ -77,6 +83,25 @@ TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *TAO_IOP::EmptyProfileList::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::TAO_IOP::EmptyProfileList, 0); + return retval; +} + +CORBA::Exception * +TAO_IOP::EmptyProfileList::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + TAO_IOP::EmptyProfileList (*this), + 0 + ); + return result; +} + void TAO_IOP::EmptyProfileList::_raise () { TAO_RAISE (*this); @@ -108,14 +133,6 @@ void TAO_IOP::EmptyProfileList::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *TAO_IOP::EmptyProfileList::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::TAO_IOP::EmptyProfileList, 0); - return retval; -} - static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -148,7 +165,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO_IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmptyProfileList, &_tc_TAO_tc_TAO_IOP_EmptyProfileList) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EmptyProfileList, &_tc_TAO_tc_TAO_IOP_EmptyProfileList) TAO_NAMESPACE_END @@ -169,12 +186,6 @@ TAO_IOP::NotFound::~NotFound (void) { } -void TAO_IOP::NotFound::_tao_any_destructor (void *x) -{ - NotFound *tmp = ACE_static_cast (NotFound*,x); - delete tmp; -} - // Copy constructor. TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -189,7 +200,12 @@ TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp) return *this; } -// Narrow. +void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer) +{ + NotFound *tmp = ACE_static_cast (NotFound*, _tao_void_pointer); + delete tmp; +} + TAO_IOP::NotFound * TAO_IOP::NotFound::_downcast (CORBA::Exception *exc) { @@ -203,6 +219,25 @@ TAO_IOP::NotFound::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *TAO_IOP::NotFound::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::TAO_IOP::NotFound, 0); + return retval; +} + +CORBA::Exception * +TAO_IOP::NotFound::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + TAO_IOP::NotFound (*this), + 0 + ); + return result; +} + void TAO_IOP::NotFound::_raise () { TAO_RAISE (*this); @@ -234,14 +269,6 @@ void TAO_IOP::NotFound::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *TAO_IOP::NotFound::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::TAO_IOP::NotFound, 0); - return retval; -} - static const CORBA::Long _oc_TAO_IOP_NotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -270,7 +297,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO_IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NotFound, &_tc_TAO_tc_TAO_IOP_NotFound) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NotFound, &_tc_TAO_tc_TAO_IOP_NotFound) TAO_NAMESPACE_END @@ -291,12 +318,6 @@ TAO_IOP::Duplicate::~Duplicate (void) { } -void TAO_IOP::Duplicate::_tao_any_destructor (void *x) -{ - Duplicate *tmp = ACE_static_cast (Duplicate*,x); - delete tmp; -} - // Copy constructor. TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -311,7 +332,12 @@ TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp) return *this; } -// Narrow. +void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer) +{ + Duplicate *tmp = ACE_static_cast (Duplicate*, _tao_void_pointer); + delete tmp; +} + TAO_IOP::Duplicate * TAO_IOP::Duplicate::_downcast (CORBA::Exception *exc) { @@ -325,6 +351,25 @@ TAO_IOP::Duplicate::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *TAO_IOP::Duplicate::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::TAO_IOP::Duplicate, 0); + return retval; +} + +CORBA::Exception * +TAO_IOP::Duplicate::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + TAO_IOP::Duplicate (*this), + 0 + ); + return result; +} + void TAO_IOP::Duplicate::_raise () { TAO_RAISE (*this); @@ -356,14 +401,6 @@ void TAO_IOP::Duplicate::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *TAO_IOP::Duplicate::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::TAO_IOP::Duplicate, 0); - return retval; -} - static const CORBA::Long _oc_TAO_IOP_Duplicate[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -392,7 +429,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO_IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Duplicate, &_tc_TAO_tc_TAO_IOP_Duplicate) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Duplicate, &_tc_TAO_tc_TAO_IOP_Duplicate) TAO_NAMESPACE_END @@ -413,12 +450,6 @@ TAO_IOP::Invalid_IOR::~Invalid_IOR (void) { } -void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *x) -{ - Invalid_IOR *tmp = ACE_static_cast (Invalid_IOR*,x); - delete tmp; -} - // Copy constructor. TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -433,7 +464,12 @@ TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp) return *this; } -// Narrow. +void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *_tao_void_pointer) +{ + Invalid_IOR *tmp = ACE_static_cast (Invalid_IOR*, _tao_void_pointer); + delete tmp; +} + TAO_IOP::Invalid_IOR * TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *exc) { @@ -447,6 +483,25 @@ TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *TAO_IOP::Invalid_IOR::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::TAO_IOP::Invalid_IOR, 0); + return retval; +} + +CORBA::Exception * +TAO_IOP::Invalid_IOR::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + TAO_IOP::Invalid_IOR (*this), + 0 + ); + return result; +} + void TAO_IOP::Invalid_IOR::_raise () { TAO_RAISE (*this); @@ -478,14 +533,6 @@ void TAO_IOP::Invalid_IOR::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *TAO_IOP::Invalid_IOR::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::TAO_IOP::Invalid_IOR, 0); - return retval; -} - static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -514,7 +561,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO_IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Invalid_IOR, &_tc_TAO_tc_TAO_IOP_Invalid_IOR) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Invalid_IOR, &_tc_TAO_tc_TAO_IOP_Invalid_IOR) TAO_NAMESPACE_END @@ -535,12 +582,6 @@ TAO_IOP::MultiProfileList::~MultiProfileList (void) { } -void TAO_IOP::MultiProfileList::_tao_any_destructor (void *x) -{ - MultiProfileList *tmp = ACE_static_cast (MultiProfileList*,x); - delete tmp; -} - // Copy constructor. TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -555,7 +596,12 @@ TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_ex return *this; } -// Narrow. +void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer) +{ + MultiProfileList *tmp = ACE_static_cast (MultiProfileList*, _tao_void_pointer); + delete tmp; +} + TAO_IOP::MultiProfileList * TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *exc) { @@ -569,6 +615,25 @@ TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *TAO_IOP::MultiProfileList::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::TAO_IOP::MultiProfileList, 0); + return retval; +} + +CORBA::Exception * +TAO_IOP::MultiProfileList::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + TAO_IOP::MultiProfileList (*this), + 0 + ); + return result; +} + void TAO_IOP::MultiProfileList::_raise () { TAO_RAISE (*this); @@ -600,14 +665,6 @@ void TAO_IOP::MultiProfileList::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *TAO_IOP::MultiProfileList::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::TAO_IOP::MultiProfileList, 0); - return retval; -} - static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -640,7 +697,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO_IOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultiProfileList, &_tc_TAO_tc_TAO_IOP_MultiProfileList) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_MultiProfileList, &_tc_TAO_tc_TAO_IOP_MultiProfileList) TAO_NAMESPACE_END @@ -652,8 +709,53 @@ CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const int TAO_IOP::TAO_IOR_Property::_tao_class_id = 0; +TAO_IOP::TAO_IOR_Property_ptr +tao_TAO_IOP_TAO_IOR_Property_duplicate ( + TAO_IOP::TAO_IOR_Property_ptr p + ) +{ + return TAO_IOP::TAO_IOR_Property::_duplicate (p); +} + +void +tao_TAO_IOP_TAO_IOR_Property_release ( + TAO_IOP::TAO_IOR_Property_ptr p + ) +{ + CORBA::release (p); +} + +TAO_IOP::TAO_IOR_Property_ptr +tao_TAO_IOP_TAO_IOR_Property_nil ( + void + ) +{ + return TAO_IOP::TAO_IOR_Property::_nil (); +} + +TAO_IOP::TAO_IOR_Property_ptr +tao_TAO_IOP_TAO_IOR_Property_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_TAO_IOP_TAO_IOR_Property_upcast ( + void *src + ) +{ + TAO_IOP::TAO_IOR_Property **tmp = + ACE_static_cast (TAO_IOP::TAO_IOR_Property **, src); + return *tmp; +} + // ************************************************************* -// Operations for class TAO_IOP::TAO_IOR_Property_var +// TAO_IOP::TAO_IOR_Property_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void) // default constructor @@ -776,7 +878,9 @@ TAO_IOP::TAO_IOR_Property_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class TAO_IOP::TAO_IOR_Property_out +// TAO_IOP::TAO_IOR_Property_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p) @@ -835,12 +939,12 @@ TAO_IOP::TAO_IOR_Property_out::operator-> (void) } -// default constructor -TAO_IOP::TAO_IOR_Property::TAO_IOR_Property () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void) +{} -// destructor TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void) {} @@ -852,7 +956,8 @@ TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow ( return TAO_IOR_Property::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_unchecked_narrow ( +TAO_IOP::TAO_IOR_Property_ptr +TAO_IOP::TAO_IOR_Property::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -905,8 +1010,53 @@ const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const int TAO_IOP::TAO_IOR_Manipulation::_tao_class_id = 0; +TAO_IOP::TAO_IOR_Manipulation_ptr +tao_TAO_IOP_TAO_IOR_Manipulation_duplicate ( + TAO_IOP::TAO_IOR_Manipulation_ptr p + ) +{ + return TAO_IOP::TAO_IOR_Manipulation::_duplicate (p); +} + +void +tao_TAO_IOP_TAO_IOR_Manipulation_release ( + TAO_IOP::TAO_IOR_Manipulation_ptr p + ) +{ + CORBA::release (p); +} + +TAO_IOP::TAO_IOR_Manipulation_ptr +tao_TAO_IOP_TAO_IOR_Manipulation_nil ( + void + ) +{ + return TAO_IOP::TAO_IOR_Manipulation::_nil (); +} + +TAO_IOP::TAO_IOR_Manipulation_ptr +tao_TAO_IOP_TAO_IOR_Manipulation_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_TAO_IOP_TAO_IOR_Manipulation_upcast ( + void *src + ) +{ + TAO_IOP::TAO_IOR_Manipulation **tmp = + ACE_static_cast (TAO_IOP::TAO_IOR_Manipulation **, src); + return *tmp; +} + // ************************************************************* -// Operations for class TAO_IOP::TAO_IOR_Manipulation_var +// TAO_IOP::TAO_IOR_Manipulation_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void) // default constructor @@ -1029,7 +1179,9 @@ TAO_IOP::TAO_IOR_Manipulation_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class TAO_IOP::TAO_IOR_Manipulation_out +// TAO_IOP::TAO_IOR_Manipulation_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &p) @@ -1088,12 +1240,12 @@ TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void) } -// default constructor -TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void) +{} -// destructor TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void) {} @@ -1105,7 +1257,8 @@ TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow ( return TAO_IOR_Manipulation::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow ( +TAO_IOP::TAO_IOR_Manipulation_ptr +TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -1162,88 +1315,88 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_ - // The Base_Sequence functions, please see tao/Sequence.h - void - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_allocate_buffer (CORBA::ULong length) - { - CORBA::Object **tmp = 0; - tmp = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_); - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - if (!this->release_) - { - tmp[i] = CORBA::Object::_duplicate (old[i]); - } - else - { - tmp[i] = old[i]; - } - } - - if (this->release_) - { - delete[] old; - } - } - this->buffer_ = tmp; - } +// The Base_Sequence functions, please see tao/Sequence.h +void +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_allocate_buffer (CORBA::ULong length) +{ + CORBA::Object **tmp = 0; + tmp = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (length); - void - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_deallocate_buffer (void) + if (this->buffer_ != 0) { - if (this->buffer_ == 0 || this->release_ == 0) - return; - CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_); - + CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - CORBA::release (tmp[i]); - tmp[i] = CORBA::Object::_nil (); + if (!this->release_) + { + tmp[i] = CORBA::Object::_duplicate (old[i]); + } + else + { + tmp[i] = old[i]; + } } - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp); - this->buffer_ = 0; + if (this->release_) + { + delete[] old; + } } + this->buffer_ = tmp; +} - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void) - { - this->_deallocate_buffer (); - } +void +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; + CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_); - void - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) - { - CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_); + for (CORBA::ULong i = 0; i < this->length_; ++i) + { + CORBA::release (tmp[i]); + tmp[i] = CORBA::Object::_nil (); + } - for (CORBA::ULong i = nl; i < ol; ++i) - { - CORBA::release (tmp[i]); - tmp[i] = CORBA::Object::_nil (); - } - } + _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp); + this->buffer_ = 0; +} - void - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast ( - void* target, - CORBA_Object *src - ACE_ENV_ARG_DECL - ) - { - CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, target); - *tmp = CORBA::Object::_narrow (src ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void) +{ + this->_deallocate_buffer (); +} - CORBA_Object* - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_upcast (void *src) const - { - CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, src); - return *tmp; - } +void +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) +{ + CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_); + + for (CORBA::ULong i = nl; i < ol; ++i) + { + CORBA::release (tmp[i]); + tmp[i] = CORBA::Object::_nil (); + } +} + +void +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast ( + void* target, + CORBA_Object *src + ACE_ENV_ARG_DECL + ) +{ + CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, target); + *tmp = CORBA::Object::_narrow (src ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +CORBA_Object* +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_upcast (void *src) const +{ + CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, src); + return *tmp; +} #endif /* end #if !defined */ @@ -1262,35 +1415,35 @@ TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void) TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max) // uses max size : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList +_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> +TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max, CORBA::ULong length, CORBA::Object_ptr *buffer, CORBA::Boolean release) : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList +_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> +TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq) // copy ctor : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList +_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> +TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor {} -void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *x) +void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *_tao_void_pointer) { - IORList *tmp = ACE_static_cast (IORList*,x); + IORList *tmp = ACE_static_cast (IORList*, _tao_void_pointer); delete tmp; } @@ -1760,4 +1913,3 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProf #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index 601190f4f12..9685178d0ca 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -36,9 +36,7 @@ #include "ior_manip_export.h" #include "tao/Exception.h" #include "tao/Object.h" -#include "tao/Environment.h" #include "tao/Sequence.h" -#include "tao/CDR.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -74,17 +72,17 @@ TAO_NAMESPACE TAO_IOP public: EmptyProfileList (void); - // Default constructor. - EmptyProfileList (const EmptyProfileList &); - // Copy constructor. - ~EmptyProfileList (void); - // Destructor. + + EmptyProfileList &operator= (const EmptyProfileList &); static void _tao_any_destructor (void*); - EmptyProfileList &operator= (const EmptyProfileList &); + static EmptyProfileList *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -98,15 +96,11 @@ TAO_NAMESPACE TAO_IOP ACE_ENV_ARG_DECL_NOT_USED ); - static EmptyProfileList *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception TAO_IOP::EmptyProfileList. + }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmptyProfileList; +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmptyProfileList; #endif /* end #if !defined */ @@ -120,17 +114,17 @@ TAO_NAMESPACE TAO_IOP public: NotFound (void); - // Default constructor. - NotFound (const NotFound &); - // Copy constructor. - ~NotFound (void); - // Destructor. + + NotFound &operator= (const NotFound &); static void _tao_any_destructor (void*); - NotFound &operator= (const NotFound &); + static NotFound *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -144,15 +138,11 @@ TAO_NAMESPACE TAO_IOP ACE_ENV_ARG_DECL_NOT_USED ); - static NotFound *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception TAO_IOP::NotFound. + }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NotFound; +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound; #endif /* end #if !defined */ @@ -166,17 +156,17 @@ TAO_NAMESPACE TAO_IOP public: Duplicate (void); - // Default constructor. - Duplicate (const Duplicate &); - // Copy constructor. - ~Duplicate (void); - // Destructor. + + Duplicate &operator= (const Duplicate &); static void _tao_any_destructor (void*); - Duplicate &operator= (const Duplicate &); + static Duplicate *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -190,15 +180,11 @@ TAO_NAMESPACE TAO_IOP ACE_ENV_ARG_DECL_NOT_USED ); - static Duplicate *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception TAO_IOP::Duplicate. + }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Duplicate; +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Duplicate; #endif /* end #if !defined */ @@ -212,17 +198,17 @@ TAO_NAMESPACE TAO_IOP public: Invalid_IOR (void); - // Default constructor. - Invalid_IOR (const Invalid_IOR &); - // Copy constructor. - ~Invalid_IOR (void); - // Destructor. + + Invalid_IOR &operator= (const Invalid_IOR &); static void _tao_any_destructor (void*); - Invalid_IOR &operator= (const Invalid_IOR &); + static Invalid_IOR *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -236,15 +222,11 @@ TAO_NAMESPACE TAO_IOP ACE_ENV_ARG_DECL_NOT_USED ); - static Invalid_IOR *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception TAO_IOP::Invalid_IOR. + }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Invalid_IOR; +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Invalid_IOR; #endif /* end #if !defined */ @@ -258,17 +240,17 @@ TAO_NAMESPACE TAO_IOP public: MultiProfileList (void); - // Default constructor. - MultiProfileList (const MultiProfileList &); - // Copy constructor. - ~MultiProfileList (void); - // Destructor. + + MultiProfileList &operator= (const MultiProfileList &); static void _tao_any_destructor (void*); - MultiProfileList &operator= (const MultiProfileList &); + static MultiProfileList *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -282,15 +264,11 @@ TAO_NAMESPACE TAO_IOP ACE_ENV_ARG_DECL_NOT_USED ); - static MultiProfileList *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception TAO_IOP::MultiProfileList. + }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MultiProfileList; +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList; #endif /* end #if !defined */ @@ -334,7 +312,10 @@ TAO_NAMESPACE TAO_IOP static TAO_IOR_Property_ptr tao_duplicate (TAO_IOR_Property_ptr); static void tao_release (TAO_IOR_Property_ptr); static TAO_IOR_Property_ptr tao_nil (void); - static TAO_IOR_Property_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static TAO_IOR_Property_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); private: @@ -375,7 +356,8 @@ TAO_NAMESPACE TAO_IOP #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_) #define _TAO_IOP_TAO_IOR_PROPERTY_CH_ -class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object + class TAO_IORManip_Export TAO_IOR_Property + : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -383,17 +365,20 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object typedef TAO_IOR_Property_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj); + static TAO_IOR_Property_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static TAO_IOR_Property_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static TAO_IOR_Property_ptr _nil (void) { @@ -402,37 +387,37 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual CORBA::Boolean set_property ( CORBA::Object_ptr ior - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR + CORBA::SystemException + , TAO_IOP::Invalid_IOR )) = 0; virtual CORBA::Boolean set_primary ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Duplicate, - TAO_IOP::NotFound + CORBA::SystemException + , TAO_IOP::Duplicate + , TAO_IOP::NotFound )) = 0; virtual CORBA::Object_ptr get_primary ( CORBA::Object_ptr ior - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound + CORBA::SystemException + , TAO_IOP::NotFound )) = 0; virtual CORBA::Boolean is_primary_set ( CORBA::Object_ptr ior - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -442,9 +427,10 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object virtual const char* _interface_repository_id (void) const; protected: - TAO_IOR_Property (); + TAO_IOR_Property (void); virtual ~TAO_IOR_Property (void); + private: TAO_IOR_Property (const TAO_IOR_Property &); void operator= (const TAO_IOR_Property &); @@ -492,7 +478,10 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object static TAO_IOR_Manipulation_ptr tao_duplicate (TAO_IOR_Manipulation_ptr); static void tao_release (TAO_IOR_Manipulation_ptr); static TAO_IOR_Manipulation_ptr tao_nil (void); - static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static TAO_IOR_Manipulation_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); private: @@ -533,7 +522,8 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_ -class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object + class TAO_IORManip_Export TAO_IOR_Manipulation + : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -541,17 +531,20 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object typedef TAO_IOR_Manipulation_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj); + static TAO_IOR_Manipulation_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static TAO_IOR_Manipulation_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static TAO_IOR_Manipulation_ptr _nil (void) { @@ -564,37 +557,51 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_ - class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void); - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum); - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum, + class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void); + _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum); + _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList ( + CORBA::ULong maximum, CORBA::ULong length, CORBA::Object* *value, - CORBA::Boolean release = 0); - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs); - virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void); - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs); - TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const; - static CORBA::Object **allocbuf (CORBA::ULong nelems); - static void freebuf (CORBA::Object **buffer); - // The Base_Sequence functions, please see tao/Sequence.h - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - CORBA::Object* *get_buffer (CORBA::Boolean orphan = 0); - const CORBA::Object* *get_buffer (void) const; - virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol); - virtual void _downcast ( - void* target, - CORBA_Object *src - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - virtual CORBA_Object* _upcast (void *src) const; - - }; + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList ( + const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs + ); + _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &operator= ( + const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs + ); + virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void); + + // = Accessors. + TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const; + + // = Static operations. + static CORBA::Object **allocbuf (CORBA::ULong nelems); + static void freebuf (CORBA::Object **buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + CORBA::Object* *get_buffer (CORBA::Boolean orphan = 0); + const CORBA::Object* *get_buffer (void) const; + virtual void _shrink_buffer ( + CORBA::ULong nl, + CORBA::ULong ol + ); + + virtual void _downcast ( + void* target, + CORBA_Object *src + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual CORBA_Object* _upcast (void *src) const; + }; #endif /* end #if !defined */ @@ -613,20 +620,20 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object class TAO_IORManip_Export IORList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList + _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> + TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: IORList (void); // default ctor IORList (CORBA::ULong max); // uses max size IORList ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Object_ptr *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + CORBA::Object_ptr *buffer, + CORBA::Boolean release = 0 + ); IORList (const IORList &); // copy ctor ~IORList (void); static void _tao_any_destructor (void*); @@ -635,6 +642,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object typedef IORList_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ + }; #endif /* end #if !defined */ @@ -650,10 +658,10 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object class TAO_IORManip_Export IORList_var { public: - IORList_var (void); // default constructor + IORList_var (void); IORList_var (IORList *); - IORList_var (const IORList_var &); // copy constructor - ~IORList_var (void); // destructor + IORList_var (const IORList_var &); + ~IORList_var (void); IORList_var &operator= (IORList *); IORList_var &operator= (const IORList_var &); @@ -700,7 +708,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object private: IORList *&ptr_; - // assignment from T_var not allowed + // Assignment from T_var not allowed. void operator= (const IORList_var &); }; @@ -709,79 +717,79 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::EmptyProfileList, - TAO_IOP::Duplicate, - TAO_IOP::Invalid_IOR + CORBA::SystemException + , TAO_IOP::EmptyProfileList + , TAO_IOP::Duplicate + , TAO_IOP::Invalid_IOR )) = 0; virtual CORBA::Object_ptr add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::EmptyProfileList, - TAO_IOP::Duplicate, - TAO_IOP::Invalid_IOR + CORBA::SystemException + , TAO_IOP::EmptyProfileList + , TAO_IOP::Duplicate + , TAO_IOP::Invalid_IOR )) = 0; virtual CORBA::Object_ptr remove_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::EmptyProfileList, - TAO_IOP::NotFound + CORBA::SystemException + , TAO_IOP::Invalid_IOR + , TAO_IOP::EmptyProfileList + , TAO_IOP::NotFound )) = 0; virtual CORBA::Boolean set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::Duplicate + CORBA::SystemException + , TAO_IOP::Invalid_IOR + , TAO_IOP::Duplicate )) = 0; virtual CORBA::Boolean set_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR, - TAO_IOP::Duplicate, - TAO_IOP::MultiProfileList, - TAO_IOP::NotFound + CORBA::SystemException + , TAO_IOP::Invalid_IOR + , TAO_IOP::Duplicate + , TAO_IOP::MultiProfileList + , TAO_IOP::NotFound )) = 0; virtual CORBA::Object_ptr get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound + CORBA::SystemException + , TAO_IOP::NotFound )) = 0; virtual CORBA::Boolean is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -789,20 +797,20 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual CORBA::ULong is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound + CORBA::SystemException + , TAO_IOP::NotFound )) = 0; virtual CORBA::ULong get_profile_count ( CORBA::Object_ptr ior - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::EmptyProfileList + CORBA::SystemException + , TAO_IOP::EmptyProfileList )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -810,9 +818,10 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object virtual const char* _interface_repository_id (void) const; protected: - TAO_IOR_Manipulation (); + TAO_IOR_Manipulation (void); virtual ~TAO_IOR_Manipulation (void); + private: TAO_IOR_Manipulation (const TAO_IOR_Manipulation &); void operator= (const TAO_IOR_Manipulation &); diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i index f7d24f5143b..c544b793ca9 100644 --- a/TAO/tao/IORManipulation/IORC.i +++ b/TAO/tao/IORManipulation/IORC.i @@ -43,214 +43,171 @@ #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___CI_) #define _TAO_IOP_TAO_IOR_PROPERTY___CI_ -ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr -tao_TAO_IOP_TAO_IOR_Property_duplicate ( - TAO_IOP::TAO_IOR_Property_ptr p - ) + +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_) +#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_ + +ACE_INLINE CORBA::Object ** +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (CORBA::ULong nelems) { - return TAO_IOP::TAO_IOR_Property::_duplicate (p); + CORBA::Object **buf = 0; + + ACE_NEW_RETURN (buf, CORBA::Object*[nelems], 0); + + for (CORBA::ULong i = 0; i < nelems; i++) + { + buf[i] = CORBA::Object::_nil (); + } + + return buf; } -ACE_INLINE void -tao_TAO_IOP_TAO_IOR_Property_release ( - TAO_IOP::TAO_IOR_Property_ptr p - ) +ACE_INLINE void +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (CORBA::Object **buffer) { - CORBA::release (p); + if (buffer == 0) + return; + delete[] buffer; } -ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr -tao_TAO_IOP_TAO_IOR_Property_nil ( - void - ) +ACE_INLINE +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void) { - return TAO_IOP::TAO_IOR_Property::_nil (); } -ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr -tao_TAO_IOP_TAO_IOR_Property_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) +ACE_INLINE +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum) + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (maximum)) { - return TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER); } -ACE_INLINE CORBA::Object * -tao_TAO_IOP_TAO_IOR_Property_upcast ( - void *src - ) +ACE_INLINE +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum, + CORBA::ULong length, + CORBA::Object* *value, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, value, release) { - TAO_IOP::TAO_IOR_Property **tmp = - ACE_static_cast (TAO_IOP::TAO_IOR_Property **, src); - return *tmp; } - -#endif /* end #if !defined */ - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_) -#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_ - - ACE_INLINE CORBA::Object ** - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (CORBA::ULong nelems) +ACE_INLINE +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs) + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - CORBA::Object **buf = 0; - - ACE_NEW_RETURN (buf, CORBA::Object*[nelems], 0); - - for (CORBA::ULong i = 0; i < nelems; i++) + CORBA::Object **tmp1 = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_); + CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - buf[i] = CORBA::Object::_nil (); + tmp1[i] = CORBA::Object::_duplicate (tmp2[i]); } - - return buf; - } - - ACE_INLINE void - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (CORBA::Object **buffer) - { - if (buffer == 0) - return; - delete[] buffer; + + this->buffer_ = tmp1; } - - ACE_INLINE - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void) - { - } - - ACE_INLINE - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (maximum)) - { - } - - ACE_INLINE - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum, - CORBA::ULong length, - CORBA::Object* *value, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, value, release) + else { + this->buffer_ = 0; } +} - ACE_INLINE - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs) - : TAO_Unbounded_Base_Sequence (rhs) +ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList & +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs) +{ + if (this == &rhs) + return *this; + + if (this->release_) { - if (rhs.buffer_ != 0) + CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object **, this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) { - CORBA::Object **tmp1 = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_); - CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - tmp1[i] = CORBA::Object::_duplicate (tmp2[i]); - } - - this->buffer_ = tmp1; + CORBA::release (tmp[i]); + tmp[i] = CORBA::Object::_nil (); } - else + if (this->maximum_ < rhs.maximum_) { - this->buffer_ = 0; + _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_); } } - - ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList & - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs) - { - if (this == &rhs) - return *this; - - if (this->release_) + else + this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + CORBA::Object **tmp1 = ACE_reinterpret_cast (CORBA::Object **, this->buffer_); + CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object **, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - CORBA::release (tmp[i]); - tmp[i] = CORBA::Object::_nil (); - } - if (this->maximum_ < rhs.maximum_) - { - _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_); - } + tmp1[i] = CORBA::Object::_duplicate (tmp2[i]); } - else - this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::Object **tmp1 = ACE_reinterpret_cast (CORBA::Object **, this->buffer_); - CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - tmp1[i] = CORBA::Object::_duplicate (tmp2[i]); - } - - return *this; - } + + return *this; +} - ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var> - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator[] (CORBA::ULong index) const - // read-write accessor - { - ACE_ASSERT (index < this->maximum_); - CORBA::Object ** const tmp = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, this->buffer_); - return TAO_Object_Manager<CORBA::Object,CORBA::Object_var> (tmp + index, this->release_); - } +ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var> +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator[] (CORBA::ULong index) const +// read-write accessor +{ + ACE_ASSERT (index < this->maximum_); + CORBA::Object ** const tmp = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, this->buffer_); + return TAO_Object_Manager<CORBA::Object,CORBA::Object_var> (tmp + index, this->release_); +} - ACE_INLINE CORBA::Object* * - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (CORBA::Boolean orphan) +ACE_INLINE CORBA::Object* * +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (CORBA::Boolean orphan) +{ + CORBA::Object **result = 0; + if (orphan == 0) { - CORBA::Object **result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (CORBA::Object**, this->buffer_); - } + result = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(CORBA::Object**,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (CORBA::Object**, this->buffer_); } - return result; } - - ACE_INLINE const CORBA::Object* * - TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (void) const + else // if (orphan == 1) { - return ACE_reinterpret_cast(const CORBA::Object ** ACE_CAST_CONST, this->buffer_); + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(CORBA::Object**,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } } + return result; +} + +ACE_INLINE const CORBA::Object* * +TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (void) const +{ + return ACE_reinterpret_cast(const CORBA::Object ** ACE_CAST_CONST, this->buffer_); +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_) #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_ @@ -306,7 +263,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_ { IORList *deep_copy = new IORList (*p.ptr_); - + if (deep_copy != 0) { IORList *tmp = deep_copy; @@ -316,7 +273,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_ } } } - + return *this; } @@ -332,27 +289,27 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator const ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast { return *this->ptr_; } -ACE_INLINE -TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast +ACE_INLINE +TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast { return *this->ptr_; } -ACE_INLINE -TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast +ACE_INLINE +TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast +TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast { return this->ptr_; } @@ -375,7 +332,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *& TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void) { @@ -436,7 +393,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (IORList *p) return *this; } -ACE_INLINE +ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast { return this->ptr_; @@ -467,49 +424,6 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index) #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___CI_) #define _TAO_IOP_TAO_IOR_MANIPULATION___CI_ -ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr -tao_TAO_IOP_TAO_IOR_Manipulation_duplicate ( - TAO_IOP::TAO_IOR_Manipulation_ptr p - ) -{ - return TAO_IOP::TAO_IOR_Manipulation::_duplicate (p); -} - -ACE_INLINE void -tao_TAO_IOP_TAO_IOR_Manipulation_release ( - TAO_IOP::TAO_IOR_Manipulation_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr -tao_TAO_IOP_TAO_IOR_Manipulation_nil ( - void - ) -{ - return TAO_IOP::TAO_IOR_Manipulation::_nil (); -} - -ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr -tao_TAO_IOP_TAO_IOR_Manipulation_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_TAO_IOP_TAO_IOR_Manipulation_upcast ( - void *src - ) -{ - TAO_IOP::TAO_IOR_Manipulation **tmp = - ACE_static_cast (TAO_IOP::TAO_IOR_Manipulation **, src); - return *tmp; -} - #endif /* end #if !defined */ diff --git a/TAO/tao/IORManipulation/diffs/IORC.h.diff b/TAO/tao/IORManipulation/diffs/IOR.diff index ce3f85e6ef3..9a7bf0ac79b 100644 --- a/TAO/tao/IORManipulation/diffs/IORC.h.diff +++ b/TAO/tao/IORManipulation/diffs/IOR.diff @@ -1,19 +1,10 @@ ---- orig/IORC.h Wed Apr 25 00:32:24 2001 -+++ IORC.h Tue Apr 24 13:44:52 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -22,12 +22,23 @@ - #ifndef _TAO_IDL_ORIG_IORC_H_ +--- orig/IORC.h Wed Feb 6 13:29:21 2002 ++++ IORC.h Wed Feb 6 13:30:34 2002 +@@ -23,13 +23,20 @@ #define _TAO_IDL_ORIG_IORC_H_ + #include "ace/pre.h" -#include "tao/corba.h" -+#include "ace/pre.h" +#include "tao/corbafwd.h" + +#ifndef TAO_IORMANIP_SAFE_INCLUDE @@ -24,12 +15,21 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -+#include "ior_manip_export.h" + #include "ior_manip_export.h" +#include "tao/Exception.h" +#include "tao/Object.h" -+#include "tao/Environment.h" +#include "tao/Sequence.h" -+#include "tao/CDR.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO +--- orig/IORC.cpp Wed Feb 6 13:29:21 2002 ++++ IORC.cpp Wed Feb 6 13:30:56 2002 +@@ -19,7 +19,7 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#include "IORC.h" ++#include "IORManip_Loader.h" + + #include "tao/Stub.h" + #include "tao/Invocation.h" diff --git a/TAO/tao/IORManipulation/diffs/IORC.cpp.diff b/TAO/tao/IORManipulation/diffs/IORC.cpp.diff deleted file mode 100644 index 6213586ea75..00000000000 --- a/TAO/tao/IORManipulation/diffs/IORC.cpp.diff +++ /dev/null @@ -1,129 +0,0 @@ ---- orig/IORC.cpp Wed Apr 25 00:32:24 2001 -+++ IORC.cpp Tue Apr 24 13:44:52 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -19,14 +19,10 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#include "IORC.h" -- --#include "tao/Stub.h" --#include "tao/Invocation.h" --#include "tao/ClientRequestInfo.h" --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -+#include "IORManip_Loader.h" -+#include "tao/Typecode.h" -+#include "tao/Any.h" -+#include "tao/ORB.h" - - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus -@@ -654,49 +650,6 @@ - return ::TAO_IOP::_tc_MultiProfileList; - } - --TAO_IOP::TAO_IOR_Property_ptr --tao_TAO_IOP_TAO_IOR_Property_duplicate ( -- TAO_IOP::TAO_IOR_Property_ptr p -- ) --{ -- return TAO_IOP::TAO_IOR_Property::_duplicate (p); --} -- --void --tao_TAO_IOP_TAO_IOR_Property_release ( -- TAO_IOP::TAO_IOR_Property_ptr p -- ) --{ -- CORBA::release (p); --} -- --TAO_IOP::TAO_IOR_Property_ptr --tao_TAO_IOP_TAO_IOR_Property_nil ( -- void -- ) --{ -- return TAO_IOP::TAO_IOR_Property::_nil (); --} -- --TAO_IOP::TAO_IOR_Property_ptr --tao_TAO_IOP_TAO_IOR_Property_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return TAO_IOP::TAO_IOR_Property::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_TAO_IOP_TAO_IOR_Property_upcast ( -- void *src -- ) --{ -- TAO_IOP::TAO_IOR_Property **tmp = -- ACE_static_cast (TAO_IOP::TAO_IOR_Property **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class TAO_IOP::TAO_IOR_Property_var - // ************************************************************* -@@ -946,49 +899,6 @@ - const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const - { - return "IDL:TAO_IOP/TAO_IOR_Property:1.0"; --} -- --TAO_IOP::TAO_IOR_Manipulation_ptr --tao_TAO_IOP_TAO_IOR_Manipulation_duplicate ( -- TAO_IOP::TAO_IOR_Manipulation_ptr p -- ) --{ -- return TAO_IOP::TAO_IOR_Manipulation::_duplicate (p); --} -- --void --tao_TAO_IOP_TAO_IOR_Manipulation_release ( -- TAO_IOP::TAO_IOR_Manipulation_ptr p -- ) --{ -- CORBA::release (p); --} -- --TAO_IOP::TAO_IOR_Manipulation_ptr --tao_TAO_IOP_TAO_IOR_Manipulation_nil ( -- void -- ) --{ -- return TAO_IOP::TAO_IOR_Manipulation::_nil (); --} -- --TAO_IOP::TAO_IOR_Manipulation_ptr --tao_TAO_IOP_TAO_IOR_Manipulation_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return TAO_IOP::TAO_IOR_Manipulation::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_TAO_IOP_TAO_IOR_Manipulation_upcast ( -- void *src -- ) --{ -- TAO_IOP::TAO_IOR_Manipulation **tmp = -- ACE_static_cast (TAO_IOP::TAO_IOR_Manipulation **, src); -- return *tmp; - } - - // ************************************************************* diff --git a/TAO/tao/IORManipulation/diffs/IORC.i.diff b/TAO/tao/IORManipulation/diffs/IORC.i.diff deleted file mode 100644 index 1e6bc608878..00000000000 --- a/TAO/tao/IORManipulation/diffs/IORC.i.diff +++ /dev/null @@ -1,110 +0,0 @@ ---- orig/IORC.i Wed Apr 25 00:32:24 2001 -+++ IORC.i Tue Apr 24 13:44:52 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -43,6 +43,49 @@ - #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___CI_) - #define _TAO_IOP_TAO_IOR_PROPERTY___CI_ - -+ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr -+tao_TAO_IOP_TAO_IOR_Property_duplicate ( -+ TAO_IOP::TAO_IOR_Property_ptr p -+ ) -+{ -+ return TAO_IOP::TAO_IOR_Property::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_TAO_IOP_TAO_IOR_Property_release ( -+ TAO_IOP::TAO_IOR_Property_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr -+tao_TAO_IOP_TAO_IOR_Property_nil ( -+ void -+ ) -+{ -+ return TAO_IOP::TAO_IOR_Property::_nil (); -+} -+ -+ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr -+tao_TAO_IOP_TAO_IOR_Property_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return TAO_IOP::TAO_IOR_Property::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_TAO_IOP_TAO_IOR_Property_upcast ( -+ void *src -+ ) -+{ -+ TAO_IOP::TAO_IOR_Property **tmp = -+ ACE_static_cast (TAO_IOP::TAO_IOR_Property **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -423,6 +466,49 @@ - - #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___CI_) - #define _TAO_IOP_TAO_IOR_MANIPULATION___CI_ -+ -+ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr -+tao_TAO_IOP_TAO_IOR_Manipulation_duplicate ( -+ TAO_IOP::TAO_IOR_Manipulation_ptr p -+ ) -+{ -+ return TAO_IOP::TAO_IOR_Manipulation::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_TAO_IOP_TAO_IOR_Manipulation_release ( -+ TAO_IOP::TAO_IOR_Manipulation_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr -+tao_TAO_IOP_TAO_IOR_Manipulation_nil ( -+ void -+ ) -+{ -+ return TAO_IOP::TAO_IOR_Manipulation::_nil (); -+} -+ -+ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr -+tao_TAO_IOP_TAO_IOR_Manipulation_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return TAO_IOP::TAO_IOR_Manipulation::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_TAO_IOP_TAO_IOR_Manipulation_upcast ( -+ void *src -+ ) -+{ -+ TAO_IOP::TAO_IOR_Manipulation **tmp = -+ ACE_static_cast (TAO_IOP::TAO_IOR_Manipulation **, src); -+ return *tmp; -+} - - - #endif /* end #if !defined */ diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl index c02ff888306..d0ff4dffcaf 100644 --- a/TAO/tao/IORTable/IORTable.pidl +++ b/TAO/tao/IORTable/IORTable.pidl @@ -6,24 +6,20 @@ * * @author Carlos O'Ryan <coryan@uci.edu> * - * @brief This file was used to generate the code in - * IORTable{C,S,S_T}.{h,i,cpp} + * @brief Pre-compiled IDL source for the IORTable module. + * + * This file was used to generate the code in + * IORTable{C,S,S_T}.{h,i,cpp} * * The command used to generate code from this file is: * - * tao_idl.exe -o orig -Ge 1 -Sa -St \ + * tao_idl.exe -o orig -Ge 1 -Sa -St -DCORBA3 \ * -Wb,export_macro=TAO_IORTable_Export \ * -Wb,export_include=iortable_export.h \ * -Wb,pre_include="ace/pre.h" \ * -Wb,post_include="ace/post.h" \ * IORTable.pidl * - * after the file is generated a patch must be applied. The patch - * disables the code under certain configurations, and eliminates - * cycles in the include dependencies. Those changes are required - * because the generated code is part of the TAO library, it hardly - * makes any sense to change the IDL compiler to support changes - * that are very occasional. */ // ================================================================ diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index bfbc2936542..c2f25f49be8 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -21,8 +21,18 @@ #include "IORTableC.h" +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) @@ -40,12 +50,6 @@ IORTable::AlreadyBound::~AlreadyBound (void) { } -void IORTable::AlreadyBound::_tao_any_destructor (void *x) -{ - AlreadyBound *tmp = ACE_static_cast (AlreadyBound*,x); - delete tmp; -} - // Copy constructor. IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -60,7 +64,12 @@ IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp) return *this; } -// Narrow. +void IORTable::AlreadyBound::_tao_any_destructor (void *_tao_void_pointer) +{ + AlreadyBound *tmp = ACE_static_cast (AlreadyBound*, _tao_void_pointer); + delete tmp; +} + IORTable::AlreadyBound * IORTable::AlreadyBound::_downcast (CORBA::Exception *exc) { @@ -74,35 +83,56 @@ IORTable::AlreadyBound::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *IORTable::AlreadyBound::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::IORTable::AlreadyBound, 0); + return retval; +} + +CORBA::Exception * +IORTable::AlreadyBound::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + IORTable::AlreadyBound (*this), + 0 + ); + return result; +} + void IORTable::AlreadyBound::_raise () { TAO_RAISE (*this); } void IORTable::AlreadyBound::_tao_encode ( - TAO_OutputCDR & + TAO_OutputCDR &cdr ACE_ENV_ARG_DECL ) const { + if (cdr << *this) + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } void IORTable::AlreadyBound::_tao_decode ( - TAO_InputCDR & + TAO_InputCDR &cdr ACE_ENV_ARG_DECL ) { + if (cdr >> *this) + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *IORTable::AlreadyBound::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::IORTable::AlreadyBound, 0); - return retval; -} - // Default constructor. IORTable::NotFound::NotFound (void) : CORBA_UserException ("IDL:IORTable/NotFound:1.0") @@ -114,12 +144,6 @@ IORTable::NotFound::~NotFound (void) { } -void IORTable::NotFound::_tao_any_destructor (void *x) -{ - NotFound *tmp = ACE_static_cast (NotFound*,x); - delete tmp; -} - // Copy constructor. IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -134,7 +158,12 @@ IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp) return *this; } -// Narrow. +void IORTable::NotFound::_tao_any_destructor (void *_tao_void_pointer) +{ + NotFound *tmp = ACE_static_cast (NotFound*, _tao_void_pointer); + delete tmp; +} + IORTable::NotFound * IORTable::NotFound::_downcast (CORBA::Exception *exc) { @@ -148,39 +177,105 @@ IORTable::NotFound::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *IORTable::NotFound::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::IORTable::NotFound, 0); + return retval; +} + +CORBA::Exception * +IORTable::NotFound::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + IORTable::NotFound (*this), + 0 + ); + return result; +} + void IORTable::NotFound::_raise () { TAO_RAISE (*this); } void IORTable::NotFound::_tao_encode ( - TAO_OutputCDR & + TAO_OutputCDR &cdr ACE_ENV_ARG_DECL ) const { + if (cdr << *this) + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } void IORTable::NotFound::_tao_decode ( - TAO_InputCDR & + TAO_InputCDR &cdr ACE_ENV_ARG_DECL ) { + if (cdr >> *this) + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *IORTable::NotFound::_alloc (void) +int IORTable::Table::_tao_class_id = 0; + +IORTable::Table_ptr +tao_IORTable_Table_duplicate ( + IORTable::Table_ptr p + ) { - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::IORTable::NotFound, 0); - return retval; + return IORTable::Table::_duplicate (p); } -int IORTable::Table::_tao_class_id = 0; +void +tao_IORTable_Table_release ( + IORTable::Table_ptr p + ) +{ + CORBA::release (p); +} + +IORTable::Table_ptr +tao_IORTable_Table_nil ( + void + ) +{ + return IORTable::Table::_nil (); +} + +IORTable::Table_ptr +tao_IORTable_Table_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_IORTable_Table_upcast ( + void *src + ) +{ + IORTable::Table **tmp = + ACE_static_cast (IORTable::Table **, src); + return *tmp; +} // ************************************************************* -// Operations for class IORTable::Table_var +// IORTable::Table_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* IORTable::Table_var::Table_var (void) // default constructor @@ -227,7 +322,7 @@ IORTable::Table_var::operator const ::IORTable::Table_ptr &() const // cast return this->ptr_; } -IORTable::Table_var::operator ::IORTable::Table_ptr &() // cast +IORTable::Table_var::operator ::IORTable::Table_ptr &() // cast { return this->ptr_; } @@ -303,7 +398,9 @@ IORTable::Table_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class IORTable::Table_out +// IORTable::Table_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* IORTable::Table_out::Table_out (Table_ptr &p) @@ -362,12 +459,12 @@ IORTable::Table_out::operator-> (void) } -// default constructor -IORTable::Table::Table () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +IORTable::Table::Table (void) +{} -// destructor IORTable::Table::~Table (void) {} @@ -379,7 +476,8 @@ IORTable::Table_ptr IORTable::Table::_narrow ( return Table::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -IORTable::Table_ptr IORTable::Table::_unchecked_narrow ( +IORTable::Table_ptr +IORTable::Table::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -419,7 +517,7 @@ void *IORTable::Table::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -432,8 +530,53 @@ const char* IORTable::Table::_interface_repository_id (void) const int IORTable::Locator::_tao_class_id = 0; +IORTable::Locator_ptr +tao_IORTable_Locator_duplicate ( + IORTable::Locator_ptr p + ) +{ + return IORTable::Locator::_duplicate (p); +} + +void +tao_IORTable_Locator_release ( + IORTable::Locator_ptr p + ) +{ + CORBA::release (p); +} + +IORTable::Locator_ptr +tao_IORTable_Locator_nil ( + void + ) +{ + return IORTable::Locator::_nil (); +} + +IORTable::Locator_ptr +tao_IORTable_Locator_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_IORTable_Locator_upcast ( + void *src + ) +{ + IORTable::Locator **tmp = + ACE_static_cast (IORTable::Locator **, src); + return *tmp; +} + // ************************************************************* -// Operations for class IORTable::Locator_var +// IORTable::Locator_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* IORTable::Locator_var::Locator_var (void) // default constructor @@ -480,7 +623,7 @@ IORTable::Locator_var::operator const ::IORTable::Locator_ptr &() const // cast return this->ptr_; } -IORTable::Locator_var::operator ::IORTable::Locator_ptr &() // cast +IORTable::Locator_var::operator ::IORTable::Locator_ptr &() // cast { return this->ptr_; } @@ -556,7 +699,9 @@ IORTable::Locator_var::tao_upcast (void *src) } // ************************************************************* -// Inline operations for class IORTable::Locator_out +// IORTable::Locator_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* IORTable::Locator_out::Locator_out (Locator_ptr &p) @@ -615,12 +760,12 @@ IORTable::Locator_out::operator-> (void) } -// default constructor -IORTable::Locator::Locator () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +IORTable::Locator::Locator (void) +{} -// destructor IORTable::Locator::~Locator (void) {} @@ -632,7 +777,8 @@ IORTable::Locator_ptr IORTable::Locator::_narrow ( return Locator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -IORTable::Locator_ptr IORTable::Locator::_unchecked_narrow ( +IORTable::Locator_ptr +IORTable::Locator::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -672,7 +818,7 @@ void *IORTable::Locator::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index 1f38984aab5..d957a528983 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -57,47 +57,50 @@ TAO_NAMESPACE IORTable { class Locator; - + #if !defined (_IORTABLE_LOCATOR___PTR_CH_) #define _IORTABLE_LOCATOR___PTR_CH_ - + typedef Locator *Locator_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_IORTABLE_LOCATOR___VAR_CH_) #define _IORTABLE_LOCATOR___VAR_CH_ - + class TAO_IORTable_Export Locator_var : public TAO_Base_var { public: Locator_var (void); // default constructor - Locator_var (Locator_ptr p) : ptr_ (p) {} + Locator_var (Locator_ptr p) : ptr_ (p) {} Locator_var (const Locator_var &); // copy constructor ~Locator_var (void); // destructor - + Locator_var &operator= (Locator_ptr); Locator_var &operator= (const Locator_var &); Locator_ptr operator-> (void) const; - + operator const Locator_ptr &() const; operator Locator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn Locator_ptr in (void) const; Locator_ptr &inout (void); Locator_ptr &out (void); Locator_ptr _retn (void); Locator_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static Locator_ptr tao_duplicate (Locator_ptr); static void tao_release (Locator_ptr); static Locator_ptr tao_nil (void); - static Locator_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static Locator_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: Locator_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -107,11 +110,11 @@ TAO_NAMESPACE IORTable #endif /* end #if !defined */ - - + + #if !defined (_IORTABLE_LOCATOR___OUT_CH_) #define _IORTABLE_LOCATOR___OUT_CH_ - + class TAO_IORTable_Export Locator_out { public: @@ -124,34 +127,34 @@ TAO_NAMESPACE IORTable operator Locator_ptr &(); Locator_ptr &ptr (void); Locator_ptr operator-> (void); - + private: Locator_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_IORTABLE_ALREADYBOUND_CH_) #define _IORTABLE_ALREADYBOUND_CH_ - + class TAO_IORTable_Export AlreadyBound : public CORBA::UserException { public: - + AlreadyBound (void); - // Default constructor. - AlreadyBound (const AlreadyBound &); - // Copy constructor. - ~AlreadyBound (void); - // Destructor. + + AlreadyBound &operator= (const AlreadyBound &); static void _tao_any_destructor (void*); - AlreadyBound &operator= (const AlreadyBound &); + static AlreadyBound *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -159,42 +162,38 @@ TAO_NAMESPACE IORTable TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - - static AlreadyBound *_downcast (CORBA::Exception *); - - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception IORTable::AlreadyBound. + + + }; #endif /* end #if !defined */ - - + + #if !defined (_IORTABLE_NOTFOUND_CH_) #define _IORTABLE_NOTFOUND_CH_ - + class TAO_IORTable_Export NotFound : public CORBA::UserException { public: - + NotFound (void); - // Default constructor. - NotFound (const NotFound &); - // Copy constructor. - ~NotFound (void); - // Destructor. + + NotFound &operator= (const NotFound &); static void _tao_any_destructor (void*); - NotFound &operator= (const NotFound &); + static NotFound *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -202,64 +201,63 @@ TAO_NAMESPACE IORTable TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - - static NotFound *_downcast (CORBA::Exception *); - - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception IORTable::NotFound. + + + }; #endif /* end #if !defined */ - - + + #if !defined (_IORTABLE_TABLE___PTR_CH_) #define _IORTABLE_TABLE___PTR_CH_ - + class Table; typedef Table *Table_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_IORTABLE_TABLE___VAR_CH_) #define _IORTABLE_TABLE___VAR_CH_ - + class TAO_IORTable_Export Table_var : public TAO_Base_var { public: Table_var (void); // default constructor - Table_var (Table_ptr p) : ptr_ (p) {} + Table_var (Table_ptr p) : ptr_ (p) {} Table_var (const Table_var &); // copy constructor ~Table_var (void); // destructor - + Table_var &operator= (Table_ptr); Table_var &operator= (const Table_var &); Table_ptr operator-> (void) const; - + operator const Table_ptr &() const; operator Table_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn Table_ptr in (void) const; Table_ptr &inout (void); Table_ptr &out (void); Table_ptr _retn (void); Table_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static Table_ptr tao_duplicate (Table_ptr); static void tao_release (Table_ptr); static Table_ptr tao_nil (void); - static Table_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static Table_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: Table_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -269,11 +267,11 @@ TAO_NAMESPACE IORTable #endif /* end #if !defined */ - - + + #if !defined (_IORTABLE_TABLE___OUT_CH_) #define _IORTABLE_TABLE___OUT_CH_ - + class TAO_IORTable_Export Table_out { public: @@ -286,19 +284,20 @@ TAO_NAMESPACE IORTable operator Table_ptr &(); Table_ptr &ptr (void); Table_ptr operator-> (void); - + private: Table_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_IORTABLE_TABLE_CH_) #define _IORTABLE_TABLE_CH_ - -class TAO_IORTable_Export Table : public virtual CORBA_Object + + class TAO_IORTable_Export Table + : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -306,80 +305,164 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object typedef Table_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static Table_ptr _duplicate (Table_ptr obj); + static Table_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static Table_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static Table_ptr _nil (void) { return (Table_ptr)0; } - + virtual void bind ( const char * object_key, const char * IOR - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - IORTable::AlreadyBound + CORBA::SystemException + , IORTable::AlreadyBound )) = 0; - + virtual void rebind ( const char * object_key, const char * IOR - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void unbind ( const char * object_key - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - IORTable::NotFound + CORBA::SystemException + , IORTable::NotFound )) = 0; - + virtual void set_locator ( IORTable::Locator_ptr the_locator - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - Table (); - + Table (void); + virtual ~Table (void); + private: Table (const Table &); void operator= (const Table &); }; - - + + +#endif /* end #if !defined */ + + +#if !defined (_IORTABLE_LOCATOR___PTR_CH_) +#define _IORTABLE_LOCATOR___PTR_CH_ + + class Locator; + typedef Locator *Locator_ptr; + #endif /* end #if !defined */ + + +#if !defined (_IORTABLE_LOCATOR___VAR_CH_) +#define _IORTABLE_LOCATOR___VAR_CH_ + + class TAO_IORTable_Export Locator_var : public TAO_Base_var + { + public: + Locator_var (void); // default constructor + Locator_var (Locator_ptr p) : ptr_ (p) {} + Locator_var (const Locator_var &); // copy constructor + ~Locator_var (void); // destructor + + Locator_var &operator= (Locator_ptr); + Locator_var &operator= (const Locator_var &); + Locator_ptr operator-> (void) const; + + operator const Locator_ptr &() const; + operator Locator_ptr &(); + // in, inout, out, _retn + Locator_ptr in (void) const; + Locator_ptr &inout (void); + Locator_ptr &out (void); + Locator_ptr _retn (void); + Locator_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static Locator_ptr tao_duplicate (Locator_ptr); + static void tao_release (Locator_ptr); + static Locator_ptr tao_nil (void); + static Locator_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + Locator_ptr ptr_; + // Unimplemented - prevents widening assignment. + Locator_var (const TAO_Base_var &rhs); + Locator_var &operator= (const TAO_Base_var &rhs); + }; +#endif /* end #if !defined */ + + +#if !defined (_IORTABLE_LOCATOR___OUT_CH_) +#define _IORTABLE_LOCATOR___OUT_CH_ + + class TAO_IORTable_Export Locator_out + { + public: + Locator_out (Locator_ptr &); + Locator_out (Locator_var &); + Locator_out (const Locator_out &); + Locator_out &operator= (const Locator_out &); + Locator_out &operator= (const Locator_var &); + Locator_out &operator= (Locator_ptr); + operator Locator_ptr &(); + Locator_ptr &ptr (void); + Locator_ptr operator-> (void); + + private: + Locator_ptr &ptr_; + }; + + +#endif /* end #if !defined */ + + #if !defined (_IORTABLE_LOCATOR_CH_) #define _IORTABLE_LOCATOR_CH_ - -class TAO_IORTable_Export Locator : public virtual CORBA_Object + + class TAO_IORTable_Export Locator + : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -387,51 +470,68 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object typedef Locator_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations + static int _tao_class_id; + + // The static operations. static Locator_ptr _duplicate (Locator_ptr obj); + static Locator_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static Locator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static Locator_ptr _nil (void) { return (Locator_ptr)0; } - + virtual char * locate ( const char * object_key - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - IORTable::NotFound + CORBA::SystemException + , IORTable::NotFound )) = 0; - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: - Locator (); - + Locator (void); + virtual ~Locator (void); + private: Locator (const Locator &); void operator= (const Locator &); }; + + +#endif /* end #if !defined */ + + +} +TAO_NAMESPACE_CLOSE // module IORTable -#endif /* end #if !defined */ +#ifndef __ACE_INLINE__ +TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::AlreadyBound &); +TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::AlreadyBound &); + +TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::NotFound &); +TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFound &); + + +#endif /* __ACE_INLINE__ */ -} -TAO_NAMESPACE_CLOSE // module IORTable #if defined (__ACE_INLINE__) #include "IORTableC.i" diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i index fd10672764d..2de74162f1b 100644 --- a/TAO/tao/IORTable/IORTableC.i +++ b/TAO/tao/IORTable/IORTableC.i @@ -31,49 +31,6 @@ #if !defined (_IORTABLE_TABLE___CI_) #define _IORTABLE_TABLE___CI_ -ACE_INLINE IORTable::Table_ptr -tao_IORTable_Table_duplicate ( - IORTable::Table_ptr p - ) -{ - return IORTable::Table::_duplicate (p); -} - -ACE_INLINE void -tao_IORTable_Table_release ( - IORTable::Table_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE IORTable::Table_ptr -tao_IORTable_Table_nil ( - void - ) -{ - return IORTable::Table::_nil (); -} - -ACE_INLINE IORTable::Table_ptr -tao_IORTable_Table_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_IORTable_Table_upcast ( - void *src - ) -{ - IORTable::Table **tmp = - ACE_static_cast (IORTable::Table **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -81,49 +38,34 @@ tao_IORTable_Table_upcast ( #if !defined (_IORTABLE_LOCATOR___CI_) #define _IORTABLE_LOCATOR___CI_ -ACE_INLINE IORTable::Locator_ptr -tao_IORTable_Locator_duplicate ( - IORTable::Locator_ptr p - ) -{ - return IORTable::Locator::_duplicate (p); -} -ACE_INLINE void -tao_IORTable_Locator_release ( - IORTable::Locator_ptr p - ) +#endif /* end #if !defined */ + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::AlreadyBound &_tao_aggregate) { - CORBA::release (p); + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; } -ACE_INLINE IORTable::Locator_ptr -tao_IORTable_Locator_nil ( - void - ) +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,IORTable::AlreadyBound&) { - return IORTable::Locator::_nil (); + return 1; } -ACE_INLINE IORTable::Locator_ptr -tao_IORTable_Locator_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::NotFound &_tao_aggregate) { - return IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER); + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; } -ACE_INLINE CORBA::Object * -tao_IORTable_Locator_upcast ( - void *src - ) +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,IORTable::NotFound&) { - IORTable::Locator **tmp = - ACE_static_cast (IORTable::Locator **, src); - return *tmp; + return 1; } - -#endif /* end #if !defined */ - diff --git a/TAO/tao/diffs/DomainS_T.cpp.diff b/TAO/tao/IORTable/diffs/IORTable.diff index e69de29bb2d..e69de29bb2d 100644 --- a/TAO/tao/diffs/DomainS_T.cpp.diff +++ b/TAO/tao/IORTable/diffs/IORTable.diff diff --git a/TAO/tao/IORTable/diffs/IORTableC.cpp.diff b/TAO/tao/IORTable/diffs/IORTableC.cpp.diff deleted file mode 100644 index 7853222465b..00000000000 --- a/TAO/tao/IORTable/diffs/IORTableC.cpp.diff +++ /dev/null @@ -1,186 +0,0 @@ ---- orig/IORTableC.cpp Wed Apr 25 00:32:42 2001 -+++ IORTableC.cpp Wed Apr 25 00:24:15 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -21,13 +21,6 @@ - - #include "IORTableC.h" - --#include "tao/Stub.h" --#include "tao/Invocation.h" --#include "tao/ClientRequestInfo.h" --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -- - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus - #endif /* __BORLANDC__ */ -@@ -87,28 +80,18 @@ - } - - void IORTable::AlreadyBound::_tao_encode ( -- TAO_OutputCDR &cdr, -+ TAO_OutputCDR &, - CORBA::Environment &ACE_TRY_ENV - ) const - { -- if (cdr << *this) -- { -- return; -- } -- - ACE_THROW (CORBA::MARSHAL ()); - } - - void IORTable::AlreadyBound::_tao_decode ( -- TAO_InputCDR &cdr, -+ TAO_InputCDR &, - CORBA::Environment &ACE_TRY_ENV - ) - { -- if (cdr >> *this) -- { -- return; -- } -- - ACE_THROW (CORBA::MARSHAL ()); - } - -@@ -171,28 +154,18 @@ - } - - void IORTable::NotFound::_tao_encode ( -- TAO_OutputCDR &cdr, -+ TAO_OutputCDR &, - CORBA::Environment &ACE_TRY_ENV - ) const - { -- if (cdr << *this) -- { -- return; -- } -- - ACE_THROW (CORBA::MARSHAL ()); - } - - void IORTable::NotFound::_tao_decode ( -- TAO_InputCDR &cdr, -+ TAO_InputCDR &, - CORBA::Environment &ACE_TRY_ENV - ) - { -- if (cdr >> *this) -- { -- return; -- } -- - ACE_THROW (CORBA::MARSHAL ()); - } - -@@ -204,49 +177,6 @@ - return retval; - } - --IORTable::Table_ptr --tao_IORTable_Table_duplicate ( -- IORTable::Table_ptr p -- ) --{ -- return IORTable::Table::_duplicate (p); --} -- --void --tao_IORTable_Table_release ( -- IORTable::Table_ptr p -- ) --{ -- CORBA::release (p); --} -- --IORTable::Table_ptr --tao_IORTable_Table_nil ( -- void -- ) --{ -- return IORTable::Table::_nil (); --} -- --IORTable::Table_ptr --tao_IORTable_Table_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return IORTable::Table::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_IORTable_Table_upcast ( -- void *src -- ) --{ -- IORTable::Table **tmp = -- ACE_static_cast (IORTable::Table **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class IORTable::Table_var - // ************************************************************* -@@ -496,49 +426,6 @@ - const char* IORTable::Table::_interface_repository_id (void) const - { - return "IDL:IORTable/Table:1.0"; --} -- --IORTable::Locator_ptr --tao_IORTable_Locator_duplicate ( -- IORTable::Locator_ptr p -- ) --{ -- return IORTable::Locator::_duplicate (p); --} -- --void --tao_IORTable_Locator_release ( -- IORTable::Locator_ptr p -- ) --{ -- CORBA::release (p); --} -- --IORTable::Locator_ptr --tao_IORTable_Locator_nil ( -- void -- ) --{ -- return IORTable::Locator::_nil (); --} -- --IORTable::Locator_ptr --tao_IORTable_Locator_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return IORTable::Locator::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_IORTable_Locator_upcast ( -- void *src -- ) --{ -- IORTable::Locator **tmp = -- ACE_static_cast (IORTable::Locator **, src); -- return *tmp; - } - - // ************************************************************* diff --git a/TAO/tao/IORTable/diffs/IORTableC.h.diff b/TAO/tao/IORTable/diffs/IORTableC.h.diff deleted file mode 100644 index e95c23874e9..00000000000 --- a/TAO/tao/IORTable/diffs/IORTableC.h.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- orig/IORTableC.h Wed Apr 25 00:32:42 2001 -+++ IORTableC.h Tue Apr 24 13:44:52 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -437,19 +437,6 @@ - - } - TAO_NAMESPACE_CLOSE // module IORTable -- -- --#ifndef __ACE_INLINE__ -- --TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::AlreadyBound &); --TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::AlreadyBound &); -- --TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::NotFound &); --TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFound &); -- -- --#endif /* __ACE_INLINE__ */ -- - - #if defined (__ACE_INLINE__) - #include "IORTableC.i" diff --git a/TAO/tao/IORTable/diffs/IORTableC.i.diff b/TAO/tao/IORTable/diffs/IORTableC.i.diff deleted file mode 100644 index 7a398b38ad8..00000000000 --- a/TAO/tao/IORTable/diffs/IORTableC.i.diff +++ /dev/null @@ -1,128 +0,0 @@ ---- orig/IORTableC.i Wed Apr 25 00:32:42 2001 -+++ IORTableC.i Tue Apr 24 13:44:52 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -31,6 +31,49 @@ - #if !defined (_IORTABLE_TABLE___CI_) - #define _IORTABLE_TABLE___CI_ - -+ACE_INLINE IORTable::Table_ptr -+tao_IORTable_Table_duplicate ( -+ IORTable::Table_ptr p -+ ) -+{ -+ return IORTable::Table::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_IORTable_Table_release ( -+ IORTable::Table_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE IORTable::Table_ptr -+tao_IORTable_Table_nil ( -+ void -+ ) -+{ -+ return IORTable::Table::_nil (); -+} -+ -+ACE_INLINE IORTable::Table_ptr -+tao_IORTable_Table_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return IORTable::Table::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_IORTable_Table_upcast ( -+ void *src -+ ) -+{ -+ IORTable::Table **tmp = -+ ACE_static_cast (IORTable::Table **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -38,34 +81,49 @@ - #if !defined (_IORTABLE_LOCATOR___CI_) - #define _IORTABLE_LOCATOR___CI_ - -+ACE_INLINE IORTable::Locator_ptr -+tao_IORTable_Locator_duplicate ( -+ IORTable::Locator_ptr p -+ ) -+{ -+ return IORTable::Locator::_duplicate (p); -+} - --#endif /* end #if !defined */ -- --ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::AlreadyBound &_tao_aggregate) -+ACE_INLINE void -+tao_IORTable_Locator_release ( -+ IORTable::Locator_ptr p -+ ) - { -- // first marshal the repository ID -- if (strm << _tao_aggregate._id ()) -- return 1; -- else -- return 0; -+ CORBA::release (p); - } - --ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,IORTable::AlreadyBound&) -+ACE_INLINE IORTable::Locator_ptr -+tao_IORTable_Locator_nil ( -+ void -+ ) - { -- return 1; -+ return IORTable::Locator::_nil (); - } - --ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::NotFound &_tao_aggregate) -+ACE_INLINE IORTable::Locator_ptr -+tao_IORTable_Locator_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) - { -- // first marshal the repository ID -- if (strm << _tao_aggregate._id ()) -- return 1; -- else -- return 0; -+ return IORTable::Locator::_narrow (p, ACE_TRY_ENV); - } - --ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,IORTable::NotFound&) -+ACE_INLINE CORBA::Object * -+tao_IORTable_Locator_upcast ( -+ void *src -+ ) - { -- return 1; -+ IORTable::Locator **tmp = -+ ACE_static_cast (IORTable::Locator **, src); -+ return *tmp; - } -+ -+ -+#endif /* end #if !defined */ - diff --git a/TAO/tao/InterfaceDef.pidl b/TAO/tao/InterfaceDef.pidl new file mode 100644 index 00000000000..81eacc638e7 --- /dev/null +++ b/TAO/tao/InterfaceDef.pidl @@ -0,0 +1,28 @@ +/** + * @file InterfaceDef.pidl + * + * $Id$ + * + * @brief Define the CORBA::InterfaceDef type. + * + * This file is used to provide a definition for the CORBA::InterfaceDef + * type, it is *NOT* pre-compiled, but included from other + * pre-compiled files. + * + */ + +#ifndef TAO_CORBA_INTERFACEDEF_PIDL +#define TAO_CORBA_INTERFACEDEF_PIDL + +#include <InterfaceDef.pidl> + +#pragma prefix "omg.org" + +module CORBA +{ + interface InterfaceDef; +}; + +#pragma prefix "" + +#endif /* TAO_CORBA_INTERFACEDEF_PIDL */ diff --git a/TAO/tao/InvalidName.pidl b/TAO/tao/InvalidName.pidl new file mode 100644 index 00000000000..67546d33943 --- /dev/null +++ b/TAO/tao/InvalidName.pidl @@ -0,0 +1,55 @@ +/** + * @file InvalidName.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the CORBA::InvalidName + * exception. + * + * This file is used to generate parts of the code in ORB.{h,i,cpp}, + * using the following command: + * + * tao_idl + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * InvalidName.pidl + * + * and then: + * + * patch < diffs/InvalidName.diff + * + * The code left in InvalidNameC.{h,i,cpp} must then be inserted into + * the ORB.{h,i,cpp} files. This sucks, but it is a direct result of + * the way the spec is defined, the ORB 'pseudo-interface' cannot be + * automatically generated, but it is better to automatically generate + * the exception, otherwise they are always out of date when compared + * to the rest of ACE+TAO. + * + */ +#ifndef TAO_CORBA_INVALIDNAME_PIDL +#define TAO_CORBA_INVALIDNAME_PIDL + +#pragma prefix "omg.org" + +module CORBA +{ + local interface ORB + { + /** + * @exception InvalidName + * + * @brief UserException for resolve_initial_references() + * + * This exception is thrown if an 'invalid name' is passed to + * the CORBA::ORB::resolve_initial_references() operation. + */ + exception InvalidName {}; + }; +}; + +#pragma prefix "" + +#endif /* TAO_CORBA_INVALIDNAME_PIDL */ diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 08f19a96df3..13ed93bf78f 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -159,6 +159,7 @@ ORB_CORE_FILES = \ ObjectIDList \ ORB \ corbafwd \ + Policy_ForwardC \ PolicyC \ Policy_Validator \ Encodable \ diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 124ee8aa48a..58b44bc467e 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -96,6 +96,7 @@ ORB_CORE_FILES = \ ObjectIDList.cpp \ ORB.cpp \ corbafwd.cpp \ + Policy_ForwardC.cpp \ PolicyC.cpp \ DomainC.cpp \ TimeBaseC.cpp \ @@ -336,6 +337,7 @@ HEADER_FILES = \ POA_CORBA.h \ Pluggable.h \ Transport.h \ + Policy_ForwardC.h \ PolicyC.h \ Policy_Manager.h \ PollableC.h \ @@ -475,6 +477,7 @@ INLINE_FILES = \ POAManager.i \ Pluggable.i \ Transport.inl \ + Policy_ForwardC.i \ PolicyC.i \ Policy_Manager.i \ PollableC.i \ diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor index d8060166384..88c02781128 100644 --- a/TAO/tao/Makefile.bor +++ b/TAO/tao/Makefile.bor @@ -146,6 +146,7 @@ OBJFILES = \ $(OBJDIR)\Pluggable.obj \ $(OBJDIR)\Pluggable_Messaging.obj \ $(OBJDIR)\Pluggable_Messaging_Utils.obj \ + $(OBJDIR)\Policy_ForwardC.obj \ $(OBJDIR)\PolicyC.obj \ $(OBJDIR)\PolicyFactory_Registry.obj \ $(OBJDIR)\Policy_Manager.obj \ diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 436dfa6e70a..83c376dfba2 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -463,4 +463,3 @@ template class auto_ptr<TAO_InputCDR>; #pragma instantiate ACE_Auto_Basic_Ptr<TAO_InputCDR> #pragma instantiate auto_ptr<TAO_InputCDR> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 49ab0de713a..f3c04583831 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -81,87 +81,87 @@ static const char ior_prefix [] = "IOR:"; // Count of the number of ORBs. int CORBA_ORB::orb_init_count_ = 0; -CORBA::Boolean -operator<< (TAO_OutputCDR &strm, - const CORBA::ORB::InvalidName &_tao_aggregate) -{ - // first marshal the repository ID - if (strm << _tao_aggregate._id ()) - return 1; - else - return 0; -} - -CORBA::Boolean operator>> (TAO_InputCDR &, - CORBA::ORB::InvalidName &) -{ - return 1; -} +// **************************************************************** -CORBA_ORB::InvalidName::InvalidName (void) +CORBA::ORB::InvalidName::InvalidName (void) : CORBA_UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0") { } +// Destructor - all members are of self managing types. CORBA::ORB::InvalidName::~InvalidName (void) { } -CORBA::ORB::InvalidName::InvalidName (const CORBA::ORB::InvalidName &_tao_excp) +// Copy constructor. +CORBA::ORB::InvalidName::InvalidName (const ::CORBA::ORB::InvalidName &_tao_excp) : CORBA_UserException (_tao_excp._id ()) { } -// assignment operator +// Assignment operator. CORBA::ORB::InvalidName& -CORBA::ORB::InvalidName::operator= (const CORBA::ORB::InvalidName &_tao_excp) +CORBA::ORB::InvalidName::operator= (const ::CORBA::ORB::InvalidName &_tao_excp) { - this->CORBA_UserException::operator= (_tao_excp); return *this; } -CORBA_ORB::InvalidName* -CORBA_ORB::InvalidName::_downcast (CORBA_Exception *ex) +CORBA::ORB::InvalidName * +CORBA::ORB::InvalidName::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", ex->_id ())) - return ACE_dynamic_cast (CORBA::ORB::InvalidName*, ex); + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", exc->_id ())) + { + return ACE_dynamic_cast (InvalidName *, exc); + } else - return 0; + { + return 0; + } } -void CORBA_ORB::InvalidName::_raise (void) +CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void) { - TAO_RAISE(*this); + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::CORBA::ORB::InvalidName, 0); + return retval; } -void CORBA_ORB::InvalidName::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const +CORBA::Exception * +CORBA::ORB::InvalidName::_tao_duplicate (void) const { - if (cdr << *this) - return; - ACE_THROW (CORBA::MARSHAL ()); + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + ::CORBA::ORB::InvalidName (*this), + 0 + ); + return result; } -void CORBA_ORB::InvalidName::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) +void CORBA::ORB::InvalidName::_raise () +{ + TAO_RAISE (*this); +} + +void CORBA::ORB::InvalidName::_tao_encode ( + TAO_OutputCDR & + ACE_ENV_ARG_DECL + ) const { - if (cdr >> *this) - return; ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method -CORBA::Exception * -CORBA::ORB::InvalidName::_alloc (void) +void CORBA::ORB::InvalidName::_tao_decode ( + TAO_InputCDR & + ACE_ENV_ARG_DECL + ) { - CORBA::ORB::InvalidName *retval = 0; - ACE_NEW_RETURN (retval, - CORBA::ORB::InvalidName, - 0); - return retval; + ACE_THROW (CORBA::MARSHAL ()); } +// **************************************************************** + CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core) : lock_ (), refcount_ (1), diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 3e0e8f120d6..ebc692cd42f 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -77,26 +77,32 @@ public: friend class TAO_ORB_Core; friend TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void); - class TAO_Export InvalidName : public CORBA_UserException + class TAO_Export InvalidName : public CORBA::UserException { public: InvalidName (void); InvalidName (const InvalidName &); ~InvalidName (void); + InvalidName &operator= (const InvalidName &); + static InvalidName *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); - virtual void _tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL_NOT_USED) const; - virtual void _tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL_NOT_USED); + virtual void _tao_encode ( + TAO_OutputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ) const; - /// = TAO extension - static InvalidName* _downcast (CORBA_Exception *ex); - static CORBA::Exception *_alloc (void); - }; - static CORBA::TypeCode_ptr _tc_InvalidName; + virtual void _tao_decode ( + TAO_InputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ); + }; typedef char *ObjectId; typedef CORBA::String_var ObjectId_var; @@ -604,18 +610,6 @@ private: CORBA::ORB_ptr &ptr_; }; -TAO_Export void -operator<<= (CORBA::Any &, const CORBA::ORB::InvalidName &); -TAO_Export void -operator<<= (CORBA::Any &, CORBA::ORB::InvalidName*); -TAO_Export CORBA::Boolean -operator>>= (const CORBA::Any &, CORBA::ORB::InvalidName *&); -TAO_Export CORBA::Boolean -operator<< (TAO_OutputCDR &, const CORBA::ORB::InvalidName &); -TAO_Export CORBA::Boolean -operator>> (TAO_InputCDR &, CORBA::ORB::InvalidName &); - - #if defined (__ACE_INLINE__) # include "tao/ORB.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/ORB.pidl b/TAO/tao/ORB.pidl deleted file mode 100644 index 861d78c131e..00000000000 --- a/TAO/tao/ORB.pidl +++ /dev/null @@ -1,15 +0,0 @@ -// -// $Id$ -// - -#pragma prefix "omg.org" - -module CORBA -{ - interface ORB { - exception InvalidName { - }; - }; -}; - -#pragma prefix "" diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index e17ee867a90..9f1db03fd5c 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -25,6 +25,7 @@ #include "tao/corbafwd.h" #include "tao/Object_Proxy_Broker.h" +#include "tao/Policy_ForwardC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/ObjectReferenceTemplate.pidl b/TAO/tao/ObjectReferenceTemplate.pidl index 46227cb4007..15389cb8d2f 100644 --- a/TAO/tao/ObjectReferenceTemplate.pidl +++ b/TAO/tao/ObjectReferenceTemplate.pidl @@ -1,19 +1,47 @@ // -*- IDL -*- -// -// $Id$ +/** + * @file ObjectReferenceTemplate.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the ObjectReferenceTemplate module. + * + * This file is used to generate ObjectReferenceTemplateC.{h,i,cpp}, + * using the following command: + * + * tao_idl.exe + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * ObjectReferenceTemplate.pidl + * + * and then: + * + * cp orig/ObjectReferenceTemplateC.{h,i,cpp} . + * patch < diffs/ObjectReferenceTemplate.diff + * + * The code left in ObjectReferenceTemplateC.{h,i,cpp} is ready for use. + * + */ // File: ObjectReferenceTemplate.idl #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_ #define _OBJECT_REFERENCE_TEMPLATE_IDL_ +#include <orb.idl> + +#include <OctetSeq.pidl> +#include <StringSeq.pidl> + #ifndef CORBA3 #define local #endif -#include "orb.idl" - -module PortableInterceptor { +module PortableInterceptor +{ typedef string ServerId ; typedef string ORBId ; @@ -44,4 +72,8 @@ module PortableInterceptor { const AdapterState NON_EXISTENT = 4 ; }; +#ifdef local +# undef local +#endif /* local */ + #endif /* _OBJECT_REFERENCE_TEMPLATE_IDL_ */ diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp index ff7ab25da80..6dfb5108b32 100644 --- a/TAO/tao/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjectReferenceTemplateC.cpp @@ -21,15 +21,21 @@ #include "ObjectReferenceTemplateC.h" -#include "StringSeqC.h" -#include "OctetSeqC.h" +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" +#include "tao/ValueFactory.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#include "CORBA_String.h" - #if !defined (__ACE_INLINE__) #include "ObjectReferenceTemplateC.i" #endif /* !defined INLINE */ @@ -38,21 +44,21 @@ static const CORBA::Long _oc_PortableInterceptor_ServerId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65724964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65724964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:PortableInterceptor/ServerId:1.0 9, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65724964), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65724964), ACE_NTOHL (0x0), // name = ServerId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -73,19 +79,19 @@ static const CORBA::Long _oc_PortableInterceptor_ORBId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f524249), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f524249), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:PortableInterceptor/ORBId:1.0 6, - ACE_NTOHL (0x4f524249), + ACE_NTOHL (0x4f524249), ACE_NTOHL (0x64000000), // name = ORBId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -106,40 +112,40 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterName[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724e), - ACE_NTOHL (0x616d653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x7465724e), + ACE_NTOHL (0x616d653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableInterceptor/AdapterName:1.0 12, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724e), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x7465724e), ACE_NTOHL (0x616d6500), // name = AdapterName CORBA::tk_alias, // typecode kind for typedefs 80, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5374), - ACE_NTOHL (0x72696e67), - ACE_NTOHL (0x5365713a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5374), + ACE_NTOHL (0x72696e67), + ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/StringSeq:1.0 10, - ACE_NTOHL (0x53747269), - ACE_NTOHL (0x6e675365), + ACE_NTOHL (0x53747269), + ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000), // name = StringSeq CORBA::tk_sequence, // typecode kind 16, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -163,35 +169,35 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:PortableInterceptor/ObjectId:1.0 9, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ObjectId CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 9, - ACE_NTOHL (0x4f637465), - ACE_NTOHL (0x74536571), + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -216,6 +222,49 @@ TAO_NAMESPACE_BEGIN (PortableInterceptor) TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableInterceptor_ObjectId) TAO_NAMESPACE_END +static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 51, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x72793a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableInterceptor/ObjectReferenceFactory:1.0 + 23, + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x72790000), // name = ObjectReferenceFactory + 2, // value modifier + CORBA::tk_null, // no stateful base valuetype + + 0, // member count +}; + +static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory ( + CORBA::tk_value, + sizeof (_oc_PortableInterceptor_ObjectReferenceFactory), + (char *) &_oc_PortableInterceptor_ObjectReferenceFactory, + 0, + sizeof (PortableInterceptor::ObjectReferenceFactory) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableInterceptor) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceFactory, &_tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory) +TAO_NAMESPACE_END + // ************************************************************* // Operations for class PortableInterceptor::ObjectReferenceFactory_var // ************************************************************* @@ -232,7 +281,7 @@ PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (con : ptr_ (ACE_const_cast(ObjectReferenceFactory*, p)) {} -PortableInterceptor::ObjectReferenceFactory* +PortableInterceptor::ObjectReferenceFactory* PortableInterceptor::ObjectReferenceFactory_var::ptr (void) const { return this->ptr_; @@ -275,12 +324,12 @@ PortableInterceptor::ObjectReferenceFactory_var::operator const PortableIntercep return this->ptr_; } -PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory* () // cast +PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory* () // cast { return this->ptr_; } -PortableInterceptor::ObjectReferenceFactory* +PortableInterceptor::ObjectReferenceFactory* PortableInterceptor::ObjectReferenceFactory_var::operator-> (void) const { return this->ptr_; @@ -306,7 +355,7 @@ PortableInterceptor::ObjectReferenceFactory_var::out (void) return this->ptr_; } -PortableInterceptor::ObjectReferenceFactory* +PortableInterceptor::ObjectReferenceFactory* PortableInterceptor::ObjectReferenceFactory_var::_retn (void) { // yield ownership of managed obj reference @@ -370,7 +419,7 @@ PortableInterceptor::ObjectReferenceFactory_out::ptr (void) // ptr return this->ptr_; } -PortableInterceptor::ObjectReferenceFactory* +PortableInterceptor::ObjectReferenceFactory* PortableInterceptor::ObjectReferenceFactory_out::operator-> (void) { return this->ptr_; @@ -395,15 +444,11 @@ void* PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t return rval; } -CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_marshal_v (TAO_OutputCDR &) -{ - return 0; -} - - -CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal_v (TAO_InputCDR &) +void +PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer) { - return 0; + ObjectReferenceFactory *tmp = ACE_static_cast (ObjectReferenceFactory*, _tao_void_pointer); + delete tmp; } CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (TAO_InputCDR &strm, ObjectReferenceFactory *&new_object) @@ -433,6 +478,49 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (TAO_ return 1; } +static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 52, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableInterceptor/ObjectReferenceTemplate:1.0 + 24, + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate + 2, // value modifier + CORBA::tk_null, // no stateful base valuetype + + 3, // member count +}; + +static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate ( + CORBA::tk_value, + sizeof (_oc_PortableInterceptor_ObjectReferenceTemplate), + (char *) &_oc_PortableInterceptor_ObjectReferenceTemplate, + 0, + sizeof (PortableInterceptor::ObjectReferenceTemplate) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableInterceptor) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceTemplate, &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate) +TAO_NAMESPACE_END + // ************************************************************* // Operations for class PortableInterceptor::ObjectReferenceTemplate_var // ************************************************************* @@ -449,7 +537,7 @@ PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (c : ptr_ (ACE_const_cast(ObjectReferenceTemplate*, p)) {} -PortableInterceptor::ObjectReferenceTemplate* +PortableInterceptor::ObjectReferenceTemplate* PortableInterceptor::ObjectReferenceTemplate_var::ptr (void) const { return this->ptr_; @@ -492,12 +580,12 @@ PortableInterceptor::ObjectReferenceTemplate_var::operator const PortableInterce return this->ptr_; } -PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate* () // cast +PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate* () // cast { return this->ptr_; } -PortableInterceptor::ObjectReferenceTemplate* +PortableInterceptor::ObjectReferenceTemplate* PortableInterceptor::ObjectReferenceTemplate_var::operator-> (void) const { return this->ptr_; @@ -523,7 +611,7 @@ PortableInterceptor::ObjectReferenceTemplate_var::out (void) return this->ptr_; } -PortableInterceptor::ObjectReferenceTemplate* +PortableInterceptor::ObjectReferenceTemplate* PortableInterceptor::ObjectReferenceTemplate_var::_retn (void) { // yield ownership of managed obj reference @@ -587,7 +675,7 @@ PortableInterceptor::ObjectReferenceTemplate_out::ptr (void) // ptr return this->ptr_; } -PortableInterceptor::ObjectReferenceTemplate* +PortableInterceptor::ObjectReferenceTemplate* PortableInterceptor::ObjectReferenceTemplate_out::operator-> (void) { return this->ptr_; @@ -614,14 +702,11 @@ void* PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t return rval; } -CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR &) -{ - return 0; -} - -CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR &) +void +PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer) { - return 0; + ObjectReferenceTemplate *tmp = ACE_static_cast (ObjectReferenceTemplate*, _tao_void_pointer); + delete tmp; } CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (TAO_InputCDR &strm, ObjectReferenceTemplate *&new_object) @@ -663,7 +748,7 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec { PortableInterceptor::ObjectReferenceTemplate **tmp = 0; tmp = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (length); - + if (this->buffer_ != 0) { PortableInterceptor::ObjectReferenceTemplate **old = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_); @@ -680,7 +765,7 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec tmp[i] = old[i]; } } - + if (this->release_) { delete[] old; @@ -695,14 +780,14 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec if (this->buffer_ == 0 || this->release_ == 0) return; PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) { if (tmp[i] != 0) tmp[i]->_remove_ref (); tmp[i] = 0; } - + _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp); this->buffer_ = 0; } @@ -716,7 +801,7 @@ void PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) { PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_); - + for (CORBA::ULong i = nl; i < ol; ++i) { if (tmp[i] != 0) @@ -729,7 +814,7 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_ @@ -741,30 +826,30 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (void) {} PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max, CORBA::ULong length, PortableInterceptor::ObjectReferenceTemplate_ptr *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void) // dtor @@ -782,31 +867,60 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 55, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x61746553), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746553), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableInterceptor/ObjectReferenceTemplateSeq:1.0 27, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x61746553), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746553), ACE_NTOHL (0x65710000), // name = ObjectReferenceTemplateSeq CORBA::tk_sequence, // typecode kind - 8, // encapsulation length + 116, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_value, // typecode kind + 448, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 52, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableInterceptor/ObjectReferenceTemplate:1.0 + 24, + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate + 2, // value modifier + CORBA::tk_null, // no stateful base valuetype + + 3, // member count + 0U, }; @@ -828,23 +942,23 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724d), - ACE_NTOHL (0x616e6167), - ACE_NTOHL (0x65724964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x7465724d), + ACE_NTOHL (0x616e6167), + ACE_NTOHL (0x65724964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:PortableInterceptor/AdapterManagerId:1.0 17, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724d), - ACE_NTOHL (0x616e6167), - ACE_NTOHL (0x65724964), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x7465724d), + ACE_NTOHL (0x616e6167), + ACE_NTOHL (0x65724964), ACE_NTOHL (0x0), // name = AdapterManagerId CORBA::tk_long, @@ -867,21 +981,21 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterState[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x74657253), - ACE_NTOHL (0x74617465), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x74657253), + ACE_NTOHL (0x74617465), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:PortableInterceptor/AdapterState:1.0 13, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x74657253), - ACE_NTOHL (0x74617465), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x74657253), + ACE_NTOHL (0x74617465), ACE_NTOHL (0x0), // name = AdapterState CORBA::tk_short, @@ -920,6 +1034,85 @@ TAO_NAMESPACE_TYPE (const CORBA::Short) TAO_NAMESPACE_BEGIN (PortableInterceptor) TAO_NAMESPACE_DEFINE (const CORBA::Short, NON_EXISTENT, 4) TAO_NAMESPACE_END +TAO_Export void +operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory *value) // copying +{ + TAO_OutputCDR stream; + if (stream << value) + { + any._tao_replace ( + PortableInterceptor::_tc_ObjectReferenceFactory, + TAO_ENCAP_BYTE_ORDER, + stream.begin ()); + } +} + +TAO_Export void +operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory **value) // non-copying +{ + TAO_OutputCDR stream; + if (stream << *value) + { + any._tao_replace ( + PortableInterceptor::_tc_ObjectReferenceFactory, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + *value, + PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor); + } +} + +TAO_Export CORBA::Boolean +operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory *&value) +{ + ACE_TRY_NEW_ENV + { + value = 0; + CORBA::TypeCode_var type = any.type (); + + CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceFactory ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (!result) + { + return 0; // not equivalent + } + if (any.any_owns_data ()) + { + const PortableInterceptor::ObjectReferenceFactory *const_holder = ACE_static_cast ( + const PortableInterceptor::ObjectReferenceFactory*, + any.value ()); + value = ACE_const_cast ( + PortableInterceptor::ObjectReferenceFactory*, + const_holder); + return 1; + } + else + { + PortableInterceptor::ObjectReferenceFactory *tmp; + TAO_InputCDR stream ( + any._tao_get_cdr (), + any._tao_byte_order ()); + if (stream >> tmp) + { + ((CORBA::Any *)&any)->_tao_replace ( + PortableInterceptor::_tc_ObjectReferenceFactory, + 1, + ACE_static_cast (void *, tmp), + PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor); + value = tmp; + return 1; + } + + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) @@ -928,6 +1121,85 @@ TAO_NAMESPACE_END # pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +TAO_Export void +operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate *value) // copying +{ + TAO_OutputCDR stream; + if (stream << value) + { + any._tao_replace ( + PortableInterceptor::_tc_ObjectReferenceTemplate, + TAO_ENCAP_BYTE_ORDER, + stream.begin ()); + } +} + +TAO_Export void +operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate **value) // non-copying +{ + TAO_OutputCDR stream; + if (stream << *value) + { + any._tao_replace ( + PortableInterceptor::_tc_ObjectReferenceTemplate, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + *value, + PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor); + } +} + +TAO_Export CORBA::Boolean +operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate *&value) +{ + ACE_TRY_NEW_ENV + { + value = 0; + CORBA::TypeCode_var type = any.type (); + + CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplate ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (!result) + { + return 0; // not equivalent + } + if (any.any_owns_data ()) + { + const PortableInterceptor::ObjectReferenceTemplate *const_holder = ACE_static_cast ( + const PortableInterceptor::ObjectReferenceTemplate*, + any.value ()); + value = ACE_const_cast ( + PortableInterceptor::ObjectReferenceTemplate*, + const_holder); + return 1; + } + else + { + PortableInterceptor::ObjectReferenceTemplate *tmp; + TAO_InputCDR stream ( + any._tao_get_cdr (), + any._tao_byte_order ()); + if (stream >> tmp) + { + ((CORBA::Any *)&any)->_tao_replace ( + PortableInterceptor::_tc_ObjectReferenceTemplate, + 1, + ACE_static_cast (void *, tmp), + PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor); + value = tmp; + return 1; + } + + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) @@ -980,13 +1252,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplateSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -1124,7 +1396,7 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; // Add a check to the length of the sequence // to make sure it does not exceed the length @@ -1141,3 +1413,4 @@ CORBA::Boolean operator>> ( } return 0; // error } + diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h index 6400de87624..4a2f4d8720c 100644 --- a/TAO/tao/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjectReferenceTemplateC.h @@ -19,21 +19,20 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_OBJECTREFERENCETEMPLATEC_H_ -#define _TAO_IDL_OBJECTREFERENCETEMPLATEC_H_ +#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ +#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ #include "ace/pre.h" - #include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IOPC.h" - +#include "TAO_Export.h" +#include "OctetSeqC.h" +#include "StringSeqC.h" #include "ValueBase.h" -#include "ValueFactory.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -64,36 +63,36 @@ TAO_NAMESPACE PortableInterceptor typedef CORBA::String_var ServerId_var; typedef CORBA::String_out ServerId_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId; - + typedef char * ORBId; typedef CORBA::String_var ORBId_var; typedef CORBA::String_out ORBId_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId; - + typedef CORBA::StringSeq AdapterName; typedef CORBA::StringSeq_var AdapterName_var; typedef CORBA::StringSeq_out AdapterName_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName; - + typedef CORBA::OctetSeq ObjectId; typedef CORBA::OctetSeq_var ObjectId_var; typedef CORBA::OctetSeq_out ObjectId_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId; - + // Valuetype class class ObjectReferenceFactory; - + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_ - + typedef ObjectReferenceFactory *ObjectReferenceFactory_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_ - + class TAO_Export ObjectReferenceFactory_var { public: @@ -102,31 +101,31 @@ TAO_NAMESPACE PortableInterceptor ObjectReferenceFactory_var (const ObjectReferenceFactory*); // (TAO extension) ObjectReferenceFactory_var (const ObjectReferenceFactory_var &); // copy constructor ~ObjectReferenceFactory_var (void); // destructor - + ObjectReferenceFactory_var &operator= (ObjectReferenceFactory*); ObjectReferenceFactory_var &operator= (const ObjectReferenceFactory_var &); ObjectReferenceFactory* operator-> (void) const; - + operator const ObjectReferenceFactory* () const; operator ObjectReferenceFactory* (); - // in, inout, out, _retn + // in, inout, out, _retn ObjectReferenceFactory* in (void) const; ObjectReferenceFactory* &inout (void); ObjectReferenceFactory* &out (void); ObjectReferenceFactory* _retn (void); ObjectReferenceFactory* ptr (void) const; - + private: ObjectReferenceFactory* ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_ - + class TAO_Export ObjectReferenceFactory_out { public: @@ -139,28 +138,28 @@ TAO_NAMESPACE PortableInterceptor operator ObjectReferenceFactory* &(); ObjectReferenceFactory* &ptr (void); ObjectReferenceFactory* operator-> (void); - + private: ObjectReferenceFactory* &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_ - + class TAO_Export ObjectReferenceFactory : public virtual CORBA_ValueBase { public: - + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef ObjectReferenceFactory* _ptr_type; typedef ObjectReferenceFactory_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - + static ObjectReferenceFactory* _downcast (CORBA::ValueBase* ); // The address of static _downcast is implicit used as type id @@ -171,329 +170,343 @@ TAO_NAMESPACE PortableInterceptor ); virtual const char* _tao_obv_repository_id () const; static const char* _tao_obv_static_repository_id (); - + + static void _tao_any_destructor (void *); + virtual CORBA::Object_ptr make_object ( const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS - - ) = 0; - - - protected: - ObjectReferenceFactory (); - virtual ~ObjectReferenceFactory (); - - // TAO internals - virtual void *_tao_obv_narrow (ptr_arith_t); - virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); - virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); - - private: - ObjectReferenceFactory (const ObjectReferenceFactory &); - void operator= (const ObjectReferenceFactory &); - - }; - + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + protected: + ObjectReferenceFactory (); + virtual ~ObjectReferenceFactory (); + + // TAO internals + virtual void *_tao_obv_narrow (ptr_arith_t); + + private: + ObjectReferenceFactory (const ObjectReferenceFactory &); + void operator= (const ObjectReferenceFactory &); + + }; + #endif /* end #if !defined */ - - // Valuetype class - class ObjectReferenceTemplate; - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory; + + // Valuetype class + class ObjectReferenceTemplate; + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_ - - typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr; - + + typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr; + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_ - - class TAO_Export ObjectReferenceTemplate_var - { - public: - ObjectReferenceTemplate_var (void); // default constructor - ObjectReferenceTemplate_var (ObjectReferenceTemplate*); - ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension) - ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); // copy constructor - ~ObjectReferenceTemplate_var (void); // destructor - - ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*); - ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &); - ObjectReferenceTemplate* operator-> (void) const; - - operator const ObjectReferenceTemplate* () const; - operator ObjectReferenceTemplate* (); - // in, inout, out, _retn - ObjectReferenceTemplate* in (void) const; - ObjectReferenceTemplate* &inout (void); - ObjectReferenceTemplate* &out (void); - ObjectReferenceTemplate* _retn (void); - ObjectReferenceTemplate* ptr (void) const; - - private: - ObjectReferenceTemplate* ptr_; - }; - - + + class TAO_Export ObjectReferenceTemplate_var + { + public: + ObjectReferenceTemplate_var (void); // default constructor + ObjectReferenceTemplate_var (ObjectReferenceTemplate*); + ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension) + ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); // copy constructor + ~ObjectReferenceTemplate_var (void); // destructor + + ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*); + ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &); + ObjectReferenceTemplate* operator-> (void) const; + + operator const ObjectReferenceTemplate* () const; + operator ObjectReferenceTemplate* (); + // in, inout, out, _retn + ObjectReferenceTemplate* in (void) const; + ObjectReferenceTemplate* &inout (void); + ObjectReferenceTemplate* &out (void); + ObjectReferenceTemplate* _retn (void); + ObjectReferenceTemplate* ptr (void) const; + + private: + ObjectReferenceTemplate* ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_ - - class TAO_Export ObjectReferenceTemplate_out - { - public: - ObjectReferenceTemplate_out (ObjectReferenceTemplate* &); - ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &); - ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &); - ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &); - ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &); - ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*); - operator ObjectReferenceTemplate* &(); - ObjectReferenceTemplate* &ptr (void); - ObjectReferenceTemplate* operator-> (void); - - private: - ObjectReferenceTemplate* &ptr_; - }; - - + + class TAO_Export ObjectReferenceTemplate_out + { + public: + ObjectReferenceTemplate_out (ObjectReferenceTemplate* &); + ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &); + ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &); + ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &); + ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &); + ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*); + operator ObjectReferenceTemplate* &(); + ObjectReferenceTemplate* &ptr (void); + ObjectReferenceTemplate* operator-> (void); + + private: + ObjectReferenceTemplate* &ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_ - - class TAO_Export ObjectReferenceTemplate - : public virtual ObjectReferenceFactory - { - public: - + + class TAO_Export ObjectReferenceTemplate + : public virtual ObjectReferenceFactory + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef ObjectReferenceTemplate* _ptr_type; - typedef ObjectReferenceTemplate_var _var_type; + typedef ObjectReferenceTemplate* _ptr_type; + typedef ObjectReferenceTemplate_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ + + static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* ); + // The address of static _downcast is implicit used as type id - static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* ); - // The address of static _downcast is implicit used as type id - - // (TAO extensions or internals) - static CORBA::Boolean _tao_unmarshal ( - TAO_InputCDR &, - ObjectReferenceTemplate *& - ); - virtual const char* _tao_obv_repository_id () const; - static const char* _tao_obv_static_repository_id (); - - virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - - ) = 0; - virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - - ) = 0; - virtual ::PortableInterceptor::AdapterName * adapter_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - -) = 0; - -protected: - ObjectReferenceTemplate (); - virtual ~ObjectReferenceTemplate (); - - // TAO internals - virtual void *_tao_obv_narrow (ptr_arith_t); - virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); - virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); - -private: - ObjectReferenceTemplate (const ObjectReferenceTemplate &); - void operator= (const ObjectReferenceTemplate &); - -}; - + // (TAO extensions or internals) + static CORBA::Boolean _tao_unmarshal ( + TAO_InputCDR &, + ObjectReferenceTemplate *& + ); + virtual const char* _tao_obv_repository_id () const; + static const char* _tao_obv_static_repository_id (); + + static void _tao_any_destructor (void *); + + virtual char * server_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + virtual char * orb_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + virtual ::PortableInterceptor::AdapterName * adapter_name ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + protected: + ObjectReferenceTemplate (); + virtual ~ObjectReferenceTemplate (); + + // TAO internals + virtual void *_tao_obv_narrow (ptr_arith_t); + + private: + ObjectReferenceTemplate (const ObjectReferenceTemplate &); + void operator= (const ObjectReferenceTemplate &); + + }; + #endif /* end #if !defined */ - - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_) #define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_ - -class TAO_EXPORT_MACRO _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq - : public TAO_Unbounded_Base_Sequence -{ -public: - // = Initialization and termination methods. - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void); - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum); - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq ( - CORBA::ULong maximum, - CORBA::ULong length, - ObjectReferenceTemplate* *value, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq ( - const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs - ); - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= ( - const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs - ); - virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void); - - // = Accessors. - TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const; - - // = Static operations. - static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems); - static void freebuf (ObjectReferenceTemplate **buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0); - const ObjectReferenceTemplate* *get_buffer (void) const; - virtual void _shrink_buffer ( - CORBA::ULong nl, - CORBA::ULong ol - ); - - -}; - + + class TAO_EXPORT_MACRO _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void); + _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum); + _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq ( + CORBA::ULong maximum, + CORBA::ULong length, + ObjectReferenceTemplate* *value, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq ( + const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs + ); + _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= ( + const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs + ); + virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void); + + // = Accessors. + TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const; + + // = Static operations. + static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems); + static void freebuf (ObjectReferenceTemplate **buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0); + const ObjectReferenceTemplate* *get_buffer (void) const; + virtual void _shrink_buffer ( + CORBA::ULong nl, + CORBA::ULong ol + ); + + + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_ - -class ObjectReferenceTemplateSeq; -class ObjectReferenceTemplateSeq_var; - -// ************************************************************* -// ObjectReferenceTemplateSeq -// ************************************************************* - -class TAO_Export ObjectReferenceTemplateSeq : public + + class ObjectReferenceTemplateSeq; + class ObjectReferenceTemplateSeq_var; + + // ************************************************************* + // ObjectReferenceTemplateSeq + // ************************************************************* + + class TAO_Export ObjectReferenceTemplateSeq : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq + _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq #else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -{ -public: - ObjectReferenceTemplateSeq (void); // default ctor - ObjectReferenceTemplateSeq (CORBA::ULong max); // uses max size - ObjectReferenceTemplateSeq ( - CORBA::ULong max, - CORBA::ULong length, - ObjectReferenceTemplate_ptr *buffer, - CORBA::Boolean release = 0 - ); - ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); // copy ctor - ~ObjectReferenceTemplateSeq (void); - static void _tao_any_destructor (void*); - + TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + ObjectReferenceTemplateSeq (void); // default ctor + ObjectReferenceTemplateSeq (CORBA::ULong max); // uses max size + ObjectReferenceTemplateSeq ( + CORBA::ULong max, + CORBA::ULong length, + ObjectReferenceTemplate_ptr *buffer, + CORBA::Boolean release = 0 + ); + ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); // copy ctor + ~ObjectReferenceTemplateSeq (void); + static void _tao_any_destructor (void*); + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef ObjectReferenceTemplateSeq_var _var_type; + typedef ObjectReferenceTemplateSeq_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - - -}; - + + + }; + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_ - -// ************************************************************* -// class PortableInterceptor::ObjectReferenceTemplateSeq_var -// ************************************************************* - -class TAO_Export ObjectReferenceTemplateSeq_var -{ -public: - ObjectReferenceTemplateSeq_var (void); - ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *); - ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &); - ~ObjectReferenceTemplateSeq_var (void); - - ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *); - ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &); - ObjectReferenceTemplateSeq *operator-> (void); - const ObjectReferenceTemplateSeq *operator-> (void) const; - - operator const ObjectReferenceTemplateSeq &() const; - operator ObjectReferenceTemplateSeq &(); - operator ObjectReferenceTemplateSeq &() const; - operator ObjectReferenceTemplateSeq *&(); // variable-size base types only - - TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index); - - // in, inout, out, _retn - const ObjectReferenceTemplateSeq &in (void) const; - ObjectReferenceTemplateSeq &inout (void); - ObjectReferenceTemplateSeq *&out (void); - ObjectReferenceTemplateSeq *_retn (void); - ObjectReferenceTemplateSeq *ptr (void) const; - -private: - ObjectReferenceTemplateSeq *ptr_; -}; - - + + // ************************************************************* + // class PortableInterceptor::ObjectReferenceTemplateSeq_var + // ************************************************************* + + class TAO_Export ObjectReferenceTemplateSeq_var + { + public: + ObjectReferenceTemplateSeq_var (void); + ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *); + ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &); + ~ObjectReferenceTemplateSeq_var (void); + + ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *); + ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &); + ObjectReferenceTemplateSeq *operator-> (void); + const ObjectReferenceTemplateSeq *operator-> (void) const; + + operator const ObjectReferenceTemplateSeq &() const; + operator ObjectReferenceTemplateSeq &(); + operator ObjectReferenceTemplateSeq &() const; + operator ObjectReferenceTemplateSeq *&(); // variable-size base types only + + TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index); + + // in, inout, out, _retn + const ObjectReferenceTemplateSeq &in (void) const; + ObjectReferenceTemplateSeq &inout (void); + ObjectReferenceTemplateSeq *&out (void); + ObjectReferenceTemplateSeq *_retn (void); + ObjectReferenceTemplateSeq *ptr (void) const; + + private: + ObjectReferenceTemplateSeq *ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_ - -class TAO_Export ObjectReferenceTemplateSeq_out -{ -public: - ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&); - ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &); - ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &); - ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &); - ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *); - operator ObjectReferenceTemplateSeq *&(); - ObjectReferenceTemplateSeq *&ptr (void); - ObjectReferenceTemplateSeq *operator-> (void); - TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index); - -private: - ObjectReferenceTemplateSeq *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ObjectReferenceTemplateSeq_var &); -}; - - + + class TAO_Export ObjectReferenceTemplateSeq_out + { + public: + ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&); + ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &); + ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &); + ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &); + ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *); + operator ObjectReferenceTemplateSeq *&(); + ObjectReferenceTemplateSeq *&ptr (void); + ObjectReferenceTemplateSeq *operator-> (void); + TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index); + + private: + ObjectReferenceTemplateSeq *&ptr_; + // Assignment from T_var not allowed. + void operator= (const ObjectReferenceTemplateSeq_var &); + }; + + #endif /* end #if !defined */ - -TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq; - -typedef CORBA::Long AdapterManagerId; -typedef CORBA::Long_out AdapterManagerId_out; -TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId; - -typedef CORBA::Short AdapterState; -typedef CORBA::Short_out AdapterState_out; -TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState; - -TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short HOLDING; - -TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ACTIVE; - -TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short DISCARDING; - -TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short INACTIVE; - -TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NON_EXISTENT; - - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq; + + typedef CORBA::Long AdapterManagerId; + typedef CORBA::Long_out AdapterManagerId_out; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId; + + typedef CORBA::Short AdapterState; + typedef CORBA::Short_out AdapterState_out; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short HOLDING; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ACTIVE; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short DISCARDING; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short INACTIVE; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NON_EXISTENT; + + } TAO_NAMESPACE_CLOSE // module PortableInterceptor @@ -502,6 +515,14 @@ TAO_NAMESPACE OBV_PortableInterceptor } TAO_NAMESPACE_CLOSE +// Any operators for valuetype PortableInterceptor::ObjectReferenceFactory +TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying +TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&); +// Any operators for valuetype PortableInterceptor::ObjectReferenceTemplate +TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying +TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&); TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq *&); // deprecated diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl index 751255dc14b..1c5708dee1d 100644 --- a/TAO/tao/OctetSeq.pidl +++ b/TAO/tao/OctetSeq.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -Ge 1 +// -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 // -Wb,export_macro=TAO_Export // -Wb,export_include="corbafwd.h" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl index e937de6458c..256fa10946b 100644 --- a/TAO/tao/Policy.pidl +++ b/TAO/tao/Policy.pidl @@ -1,79 +1,56 @@ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// Policy.pidl -// -// = DESCRIPTION -// -// This file was used to generate the code in PolicyC.{h,i,cpp}. -// Also, skeleton code for the only non local Policy interface is -// generated from this pidl file and then the declaration code is -// moved to POA_CORBA.h and the definition is kept in PolicyS.cpp. -// -// The steps to regenerate the code are as follows: -// -// 1. Patch this pidl file to (a) remove the CORBA module bringing -// the Policy interfaces to the global scope; and (b) rename the -// Policy interfaces to CORBA_Policy. -// -// Apply patches using the following commands: -// -// patch < diffs/Policy.pidl.diff -// -// 2. Run the tao_idl compiler on the patched pidl file. The -// command used for this is: -// -// tao_idl.exe -// -o orig -// -Ge 1 -// -Wb,export_macro=TAO_Export -// -Wb,export_include="tao/corbafwd.h" -// -Wb,pre_include="ace/pre.h" -// -Wb,post_include="ace/post.h" -// Policy.pidl -// -// 3. Then patch the generated code. This patch (a) fixes the -// interface repository IDs; (b) eliminates cycles in the include -// dependencies; (c) removes the extra CORBA module; (d) removes the -// extra Current interface; (e) adds the TAO_Encodable methods to -// the Policy class; (f) adds the PolicyErrorCode constants; (g) -// fixes the Policy class skeleton code to fit into the POA_CORBA -// namespace; and (h) removes the typecodes definitions. -// -// Apply patches using the following commands: -// -// patch < diffs/PolicyC.h.diff -// patch < diffs/PolicyC.i.diff -// patch < diffs/PolicyC.cpp.diff -// -// patch < diffs/PolicyS.h.diff -// -// 4. You'll have to move the Policy skeleton definition from -// PolicyS.h to the POA_CORBA.h by hand. -// -// 5. Undo the patches to this pidl file. -// -// patch -R < diffs/Policy.pidl.diff -// -// Note: The diffs were generated with these commands: -// -// diff -wbu Policy.pidl Policy.pidl.mod > diffs/Policy.pidl.diff -// -// diff -wBbu orig/PolicyC.h PolicyC.h > diffs/PolicyC.h.diff -// diff -wBbu orig/PolicyC.i PolicyC.i > diffs/PolicyC.i.diff -// diff -wBbu orig/PolicyC.cpp PolicyC.cpp > diffs/PolicyC.cpp.diff -// diff -wBbu orig/PolicyS.h PolicyS.h > diffs/PolicyS.h.diff -// -// ================================================================ +/** + * @file Policy.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the CORBA::Policy related + * classes. + * + * This file is used to generate the code in PolicyC.{h,i,cpp}. + * Also, skeleton code for the only non local Policy interface is + * generated from this pidl file and then the declaration code is + * moved to tao/PortableServer/PolicyS.{h,i,cpp} + * + * The steps to regenerate the code are as follows: + * + * 1. Run the tao_idl compiler on the patched pidl file. The + * command used for this is: + * + * tao_idl.exe + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_Export + * -Wb,export_include="tao/corbafwd.h" + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * Policy.pidl + * + * 2. Then patch the generated code. This patch (a) eliminates + * cycles in the include dependencies; (b) adds the TAO_Encodable + * methods to the Policy class; (c) fixes the #includes in the + * PolicyS.h file. + * + * Apply patches using the following commands: + * + * cp orig/PolicyC.{h,i,cpp} . + * cp orig/PolicyS.{h,i,cpp} PortableServer + * cp orig/PolicyS_T.{h,i,cpp} PortableServer + * patch < diffs/Policy.diff + * + * Note: The diffs were generated with these commands: + * + * for i in PolicyC.{h,i,cpp}; do + * diff -wBbu orig/$i $i; + * done > diffs/Policy.diff + * for i in Policy{S,S_T}.{h,i,cpp}; do + * diff -wBbu orig/$i PortableServer/$i; + * done >> diffs/Policy.diff + */ -#ifndef TAO_CORBA_POLICY_IDL -#define TAO_CORBA_POLICY_IDL +#ifndef TAO_CORBA_POLICY_PIDL +#define TAO_CORBA_POLICY_PIDL + +#include <Current.pidl> +#include <Policy_Forward.pidl> #pragma prefix "omg.org" @@ -96,7 +73,6 @@ module CORBA sequence<unsigned short> indices; }; - typedef unsigned long PolicyType; interface Policy { readonly attribute PolicyType policy_type; @@ -104,16 +80,6 @@ module CORBA void destroy (); }; - typedef sequence<Policy> PolicyList; - - typedef sequence<PolicyType> PolicyTypeSeq; - - enum SetOverrideType - { - SET_OVERRIDE, - ADD_OVERRIDE - }; - local interface PolicyManager { PolicyList get_policy_overrides (in PolicyTypeSeq ts); @@ -123,10 +89,6 @@ module CORBA raises (InvalidPolicies); }; - local interface Current - { - }; - local interface PolicyCurrent : PolicyManager, Current { }; @@ -135,4 +97,4 @@ module CORBA #pragma prefix "" -#endif /* TAO_CORBA_POLICY_IDL */ +#endif /* TAO_CORBA_POLICY_PIDL */ diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index adff3529778..4b3e29dbe02 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -2,7 +2,6 @@ // // $Id$ - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: // Center for Distributed Object Computing @@ -33,57 +32,82 @@ #endif /* TAO_HAS_INTERCEPTORS == 1 */ #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) #include "PolicyC.i" #endif /* !defined INLINE */ -// **************************************************************** +static const CORBA::Long _oc_CORBA_PolicyErrorCode[] = +{ + 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_PolicyErrorCode ( + CORBA::tk_alias, + sizeof (_oc_CORBA_PolicyErrorCode), + (char *) &_oc_CORBA_PolicyErrorCode, + 0, + sizeof (CORBA::PolicyErrorCode) + ); -TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY, 0) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyErrorCode, &_tc_TAO_tc_CORBA_PolicyErrorCode) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) + +TAO_NAMESPACE_TYPE (const CORBA::Short) TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY, 1) +TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY, 0) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) +TAO_NAMESPACE_TYPE (const CORBA::Short) TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY_TYPE, 2) +TAO_NAMESPACE_DEFINE (const CORBA::Short, UNSUPPORTED_POLICY, 1) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) +TAO_NAMESPACE_TYPE (const CORBA::Short) TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY_VALUE, 3) +TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY_TYPE, 2) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) +TAO_NAMESPACE_TYPE (const CORBA::Short) TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY_VALUE, 4) +TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY_VALUE, 3) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::Short) +TAO_NAMESPACE_BEGIN (CORBA) +TAO_NAMESPACE_DEFINE (const CORBA::Short, UNSUPPORTED_POLICY_VALUE, 4) TAO_NAMESPACE_END - -// **************************************************************** - // Default constructor. -CORBA_PolicyError::CORBA_PolicyError (void) +CORBA::PolicyError::PolicyError (void) : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0") { } // Destructor - all members are of self managing types. -CORBA_PolicyError::~CORBA_PolicyError (void) +CORBA::PolicyError::~PolicyError (void) { } -void CORBA_PolicyError::_tao_any_destructor (void *x) -{ - CORBA_PolicyError *tmp = ACE_static_cast (CORBA_PolicyError*,x); - delete tmp; -} - // Copy constructor. -CORBA_PolicyError::CORBA_PolicyError (const ::CORBA::PolicyError &_tao_excp) +CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp) : CORBA_UserException (_tao_excp._id ()) { this->reason = _tao_excp.reason; @@ -98,13 +122,18 @@ CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp) return *this; } -// Narrow. +void CORBA::PolicyError::_tao_any_destructor (void *_tao_void_pointer) +{ + PolicyError *tmp = ACE_static_cast (PolicyError*, _tao_void_pointer); + delete tmp; +} + CORBA::PolicyError * CORBA::PolicyError::_downcast (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ())) { - return ACE_dynamic_cast (CORBA_PolicyError *, exc); + return ACE_dynamic_cast (PolicyError *, exc); } else { @@ -112,6 +141,25 @@ CORBA::PolicyError::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *CORBA::PolicyError::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::CORBA::PolicyError, 0); + return retval; +} + +CORBA::Exception * +CORBA::PolicyError::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA::PolicyError (*this), + 0 + ); + return result; +} + void CORBA::PolicyError::_raise () { TAO_RAISE (*this); @@ -126,7 +174,7 @@ void CORBA::PolicyError::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -139,19 +187,11 @@ void CORBA::PolicyError::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *CORBA::PolicyError::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::CORBA::PolicyError, 0); - return retval; -} - -CORBA_PolicyError::CORBA_PolicyError ( +CORBA::PolicyError::PolicyError ( CORBA::PolicyErrorCode _tao_reason ) : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0") @@ -159,6 +199,65 @@ CORBA_PolicyError::CORBA_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 + + // TAO extension - the virtual _type method. CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const { @@ -171,90 +270,90 @@ CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const #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) +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* 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; + 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; - } +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 (); - } +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 */ +#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 // ************************************************************* -CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void) +CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void) {} -CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max) // uses max size - : +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 +_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::UShort> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::UShort> +#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) - : +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 +_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::UShort> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::UShort> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} -CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (const _tao_seq_UShort &seq) // copy ctor - : +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 +_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::UShort> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +TAO_Unbounded_Sequence<CORBA::UShort> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} -CORBA_InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) // dtor +CORBA::InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) // dtor {} -void CORBA_InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *x) +void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_void_pointer) { - _tao_seq_UShort *tmp = ACE_static_cast (_tao_seq_UShort*,x); + _tao_seq_UShort *tmp = ACE_static_cast (_tao_seq_UShort*, _tao_void_pointer); delete tmp; } @@ -262,45 +361,44 @@ void CORBA_InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *x) #endif /* end #if !defined */ // Default constructor. -CORBA_InvalidPolicies::CORBA_InvalidPolicies (void) +CORBA::InvalidPolicies::InvalidPolicies (void) : CORBA_UserException ("IDL:omg.org/CORBA/InvalidPolicies:1.0") { } // Destructor - all members are of self managing types. -CORBA_InvalidPolicies::~CORBA_InvalidPolicies (void) -{ -} - -void CORBA_InvalidPolicies::_tao_any_destructor (void *x) +CORBA::InvalidPolicies::~InvalidPolicies (void) { - CORBA_InvalidPolicies *tmp = ACE_static_cast (CORBA_InvalidPolicies*,x); - delete tmp; } // Copy constructor. -CORBA_InvalidPolicies::CORBA_InvalidPolicies (const ::CORBA_InvalidPolicies &_tao_excp) +CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_excp) : CORBA_UserException (_tao_excp._id ()) { 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); this->indices = _tao_excp.indices; return *this; } -// Narrow. -CORBA_InvalidPolicies * -CORBA_InvalidPolicies::_downcast (CORBA::Exception *exc) +void CORBA::InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer) +{ + InvalidPolicies *tmp = ACE_static_cast (InvalidPolicies*, _tao_void_pointer); + delete tmp; +} + +CORBA::InvalidPolicies * +CORBA::InvalidPolicies::_downcast (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_id ())) { - return ACE_dynamic_cast (CORBA_InvalidPolicies *, exc); + return ACE_dynamic_cast (InvalidPolicies *, exc); } else { @@ -308,12 +406,31 @@ CORBA_InvalidPolicies::_downcast (CORBA::Exception *exc) } } -void CORBA_InvalidPolicies::_raise () +CORBA::Exception *CORBA::InvalidPolicies::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::CORBA::InvalidPolicies, 0); + return retval; +} + +CORBA::Exception * +CORBA::InvalidPolicies::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA::InvalidPolicies (*this), + 0 + ); + return result; +} + +void CORBA::InvalidPolicies::_raise () { TAO_RAISE (*this); } -void CORBA_InvalidPolicies::_tao_encode ( +void CORBA::InvalidPolicies::_tao_encode ( TAO_OutputCDR &cdr ACE_ENV_ARG_DECL ) const @@ -322,11 +439,11 @@ void CORBA_InvalidPolicies::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -void CORBA_InvalidPolicies::_tao_decode ( +void CORBA::InvalidPolicies::_tao_decode ( TAO_InputCDR &cdr ACE_ENV_ARG_DECL ) @@ -335,32 +452,72 @@ void CORBA_InvalidPolicies::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *CORBA_InvalidPolicies::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::CORBA_InvalidPolicies, 0); - return retval; -} - -CORBA_InvalidPolicies::CORBA_InvalidPolicies ( - const CORBA_InvalidPolicies::_tao_seq_UShort & _tao_indices +CORBA::InvalidPolicies::InvalidPolicies ( + const CORBA::InvalidPolicies::_tao_seq_UShort & _tao_indices ) : CORBA_UserException ("IDL:omg.org/CORBA/InvalidPolicies:1.0") { this->indices = _tao_indices; } +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 + + // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr CORBA_InvalidPolicies::_type (void) const +CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const { return ::CORBA::_tc_InvalidPolicies; } +int CORBA::Policy::_tao_class_id = 0; + CORBA::Policy_ptr tao_CORBA_Policy_duplicate ( CORBA::Policy_ptr p @@ -404,34 +561,34 @@ tao_CORBA_Policy_upcast ( return *tmp; } -int CORBA_Policy::_tao_class_id = 0; - // ************************************************************* -// Operations for class CORBA::Policy_var +// CORBA::Policy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* -CORBA_Policy_var::CORBA_Policy_var (void) // default constructor - : ptr_ (CORBA_Policy::_nil ()) +CORBA::Policy_var::Policy_var (void) // default constructor + : ptr_ (Policy::_nil ()) {} ::CORBA::Policy_ptr -CORBA_Policy_var::ptr (void) const +CORBA::Policy_var::ptr (void) const { return this->ptr_; } -CORBA_Policy_var::CORBA_Policy_var (const ::CORBA::Policy_var &p) // copy constructor +CORBA::Policy_var::Policy_var (const ::CORBA::Policy_var &p) // copy constructor : TAO_Base_var (), - ptr_ (CORBA_Policy::_duplicate (p.ptr ())) + ptr_ (Policy::_duplicate (p.ptr ())) {} -CORBA_Policy_var::~CORBA_Policy_var (void) // destructor +CORBA::Policy_var::~Policy_var (void) // destructor { CORBA::release (this->ptr_); } CORBA::Policy_var & -CORBA_Policy_var::operator= (CORBA_Policy_ptr p) +CORBA::Policy_var::operator= (Policy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -439,7 +596,7 @@ CORBA_Policy_var::operator= (CORBA_Policy_ptr p) } CORBA::Policy_var & -CORBA_Policy_var::operator= (const ::CORBA::Policy_var &p) +CORBA::Policy_var::operator= (const ::CORBA::Policy_var &p) { if (this != &p) { @@ -449,36 +606,36 @@ CORBA_Policy_var::operator= (const ::CORBA::Policy_var &p) return *this; } -CORBA_Policy_var::operator const ::CORBA::Policy_ptr &() const // cast +CORBA::Policy_var::operator const ::CORBA::Policy_ptr &() const // cast { return this->ptr_; } -CORBA_Policy_var::operator ::CORBA::Policy_ptr &() // cast +CORBA::Policy_var::operator ::CORBA::Policy_ptr &() // cast { return this->ptr_; } ::CORBA::Policy_ptr -CORBA_Policy_var::operator-> (void) const +CORBA::Policy_var::operator-> (void) const { return this->ptr_; } ::CORBA::Policy_ptr -CORBA_Policy_var::in (void) const +CORBA::Policy_var::in (void) const { return this->ptr_; } ::CORBA::Policy_ptr & -CORBA_Policy_var::inout (void) +CORBA::Policy_var::inout (void) { return this->ptr_; } ::CORBA::Policy_ptr & -CORBA_Policy_var::out (void) +CORBA::Policy_var::out (void) { CORBA::release (this->ptr_); this->ptr_ = ::CORBA::Policy::_nil (); @@ -486,7 +643,7 @@ CORBA_Policy_var::out (void) } ::CORBA::Policy_ptr -CORBA_Policy_var::_retn (void) +CORBA::Policy_var::_retn (void) { // yield ownership of managed obj reference ::CORBA::Policy_ptr val = this->ptr_; @@ -495,25 +652,25 @@ CORBA_Policy_var::_retn (void) } ::CORBA::Policy_ptr -CORBA_Policy_var::tao_duplicate (CORBA_Policy_ptr p) +CORBA::Policy_var::tao_duplicate (Policy_ptr p) { return ::CORBA::Policy::_duplicate (p); } void -CORBA_Policy_var::tao_release (CORBA_Policy_ptr p) +CORBA::Policy_var::tao_release (Policy_ptr p) { CORBA::release (p); } ::CORBA::Policy_ptr -CORBA_Policy_var::tao_nil (void) +CORBA::Policy_var::tao_nil (void) { return ::CORBA::Policy::_nil (); } ::CORBA::Policy_ptr -CORBA_Policy_var::tao_narrow ( +CORBA::Policy_var::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) @@ -522,68 +679,70 @@ CORBA_Policy_var::tao_narrow ( } CORBA::Object * -CORBA_Policy_var::tao_upcast (void *src) +CORBA::Policy_var::tao_upcast (void *src) { - CORBA_Policy **tmp = - ACE_static_cast (CORBA_Policy **, src); + Policy **tmp = + ACE_static_cast (Policy **, src); return *tmp; } // ************************************************************* -// Operations for class CORBA::Policy_out +// CORBA::Policy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* -CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_ptr &p) +CORBA::Policy_out::Policy_out (Policy_ptr &p) : ptr_ (p) { this->ptr_ = ::CORBA::Policy::_nil (); } -CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_var &p) // constructor from _var +CORBA::Policy_out::Policy_out (Policy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); this->ptr_ = ::CORBA::Policy::_nil (); } -CORBA_Policy_out::CORBA_Policy_out (const ::CORBA_Policy_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_Policy_out &, p).ptr_) +CORBA::Policy_out::Policy_out (const ::CORBA::Policy_out &p) // copy constructor + : ptr_ (ACE_const_cast (Policy_out &, p).ptr_) {} -::CORBA_Policy_out & -CORBA_Policy_out::operator= (const ::CORBA::Policy_out &p) +::CORBA::Policy_out & +CORBA::Policy_out::operator= (const ::CORBA::Policy_out &p) { - this->ptr_ = ACE_const_cast (CORBA_Policy_out&, p).ptr_; + this->ptr_ = ACE_const_cast (Policy_out&, p).ptr_; return *this; } CORBA::Policy_out & -CORBA_Policy_out::operator= (const ::CORBA::Policy_var &p) +CORBA::Policy_out::operator= (const ::CORBA::Policy_var &p) { this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ()); return *this; } CORBA::Policy_out & -CORBA_Policy_out::operator= (CORBA_Policy_ptr p) +CORBA::Policy_out::operator= (Policy_ptr p) { this->ptr_ = p; return *this; } -CORBA_Policy_out::operator ::CORBA::Policy_ptr &() // cast +CORBA::Policy_out::operator ::CORBA::Policy_ptr &() // cast { return this->ptr_; } ::CORBA::Policy_ptr & -CORBA_Policy_out::ptr (void) // ptr +CORBA::Policy_out::ptr (void) // ptr { return this->ptr_; } ::CORBA::Policy_ptr -CORBA_Policy_out::operator-> (void) +CORBA::Policy_out::operator-> (void) { return this->ptr_; } @@ -595,23 +754,16 @@ class TAO_ClientRequestInfo_CORBA_Policy_policy_type_get : public TAO_ClientRequ public: TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::PolicyType result); @@ -625,8 +777,7 @@ private: TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} @@ -639,8 +790,9 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_AR Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; + } Dynamic::ExceptionList * @@ -651,12 +803,11 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_A Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -665,17 +816,17 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_D CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; return safe_result_any._retn (); } -void +void TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result) { - // update the result + // update the result this->_result = result; } @@ -684,23 +835,16 @@ class TAO_ClientRequestInfo_CORBA_Policy_copy : public TAO_ClientRequestInfo_i public: TAO_ClientRequestInfo_CORBA_Policy_copy ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Policy_ptr result); @@ -714,8 +858,7 @@ private: TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} @@ -728,8 +871,9 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; + } Dynamic::ExceptionList * @@ -740,12 +884,11 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -754,17 +897,17 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL) CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; return safe_result_any._retn (); } -void -TAO_ClientRequestInfo_CORBA_Policy_copy::result (CORBA::Policy_ptr result) +void +TAO_ClientRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result) { - // update the result + // update the result this->_result = result; } @@ -773,36 +916,28 @@ class TAO_ClientRequestInfo_CORBA_Policy_destroy : public TAO_ClientRequestInfo_ public: TAO_ClientRequestInfo_CORBA_Policy_destroy ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: TAO_ClientRequestInfo_CORBA_Policy_destroy (const TAO_ClientRequestInfo_CORBA_Policy_destroy &); void operator= (const TAO_ClientRequestInfo_CORBA_Policy_destroy &); - + }; TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} @@ -815,8 +950,9 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; + } Dynamic::ExceptionList * @@ -827,12 +963,11 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -841,41 +976,41 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL) CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } #endif /* TAO_HAS_INTERCEPTORS */ /////////////////////////////////////////////////////////////////////// -// Base & Remote Proxy Implementation. +// Base & Remote Proxy Implementation. // -CORBA_TAO_Policy_Proxy_Impl::CORBA_TAO_Policy_Proxy_Impl (void) +CORBA::_TAO_Policy_Proxy_Impl::_TAO_Policy_Proxy_Impl (void) {} -CORBA_TAO_Policy_Remote_Proxy_Impl::CORBA_TAO_Policy_Remote_Proxy_Impl (void) +CORBA::_TAO_Policy_Remote_Proxy_Impl::_TAO_Policy_Remote_Proxy_Impl (void) {} // Remote Implementation of the IDL interface methods -CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( - CORBA::Object_ptr _collocated_tao_target_ +CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - + CORBA::PolicyType _tao_retval = 0; - - + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - + ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval); + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_policy_type", @@ -883,89 +1018,88 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( 0, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ri ( + TAO_ClientRequestInfo_CORBA_Policy_policy_type_get _tao_ri ( &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + _collocated_tao_target_ ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (_tao_retval); + ACE_CHECK_RETURN (_tao_retval); #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW_RETURN ( - CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES), _tao_retval ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( (_tao_in >> _tao_retval) @@ -975,74 +1109,74 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval ); - + } - + #if TAO_HAS_INTERCEPTORS == 1 CORBA::PolicyType _tao_retval_info = _tao_retval; - ri.result (_tao_retval_info); - - ri.reply_status (_invoke_status); + _tao_ri.result (_tao_retval_info); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval); + ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } return _tao_retval; } -CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( - CORBA::Object_ptr _collocated_tao_target_ +::CORBA::Policy_ptr CORBA::_TAO_Policy_Remote_Proxy_Impl::copy ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - - CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil (); - CORBA::Policy_var _tao_safe_retval (_tao_retval); + + CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ()); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), 0); - + ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ()); + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "copy", @@ -1050,166 +1184,165 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( 0, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_Policy_copy ri ( + TAO_ClientRequestInfo_CORBA_Policy_copy _tao_ri ( &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + _collocated_tao_target_ ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (_tao_retval._retn ()); #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW_RETURN ( - CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES), 0 ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( - (_tao_in >> _tao_safe_retval.inout ()) + (_tao_in >> _tao_retval.inout ()) )) { TAO_INTERCEPTOR_THROW_RETURN ( CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0 ); - + } - + #if TAO_HAS_INTERCEPTORS == 1 - CORBA::Policy_ptr _tao_retval_info = _tao_safe_retval._retn (); - ri.result (_tao_retval_info); - _tao_safe_retval = _tao_retval_info; - - ri.reply_status (_invoke_status); + ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn (); + _tao_ri.result (_tao_retval_info); + _tao_retval = _tao_retval_info; + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (_tao_retval._retn ()); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval._retn ()); if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } -return _tao_safe_retval._retn (); +return _tao_retval._retn (); } -void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( - CORBA::Object_ptr _collocated_tao_target_ +void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - - - - + + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "destroy", @@ -1217,129 +1350,128 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( 0, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_Policy_destroy ri ( + TAO_ClientRequestInfo_CORBA_Policy_destroy _tao_ri ( &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + _collocated_tao_target_ ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( - CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri - ACE_ENV_ARG_PARAMETER + &_tao_ri + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -1347,7 +1479,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( // -// End Base & Remote Proxy Implemeentation. +// End Base & Remote Proxy Implemeentation. /////////////////////////////////////////////////////////////////////// @@ -1355,36 +1487,36 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( // Remote & Base Proxy Broker Implementation // -CORBA_TAO_Policy_Proxy_Broker::CORBA_TAO_Policy_Proxy_Broker (void) +CORBA::_TAO_Policy_Proxy_Broker::_TAO_Policy_Proxy_Broker (void) { } -CORBA_TAO_Policy_Proxy_Broker::~CORBA_TAO_Policy_Proxy_Broker (void) +CORBA::_TAO_Policy_Proxy_Broker::~_TAO_Policy_Proxy_Broker (void) { } -CORBA_TAO_Policy_Proxy_Broker * (*CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer) ( +CORBA::_TAO_Policy_Proxy_Broker * (*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; // Factory Member function Implementation. -CORBA_TAO_Policy_Remote_Proxy_Broker * -CORBA_TAO_Policy_Remote_Proxy_Broker::the_CORBA_TAO_Policy_Remote_Proxy_Broker (void) +CORBA::_TAO_Policy_Remote_Proxy_Broker * +CORBA::_TAO_Policy_Remote_Proxy_Broker::the_TAO_Policy_Remote_Proxy_Broker (void) { - static CORBA_TAO_Policy_Remote_Proxy_Broker remote_proxy_broker; + static ::CORBA::_TAO_Policy_Remote_Proxy_Broker remote_proxy_broker; return &remote_proxy_broker; } -CORBA_TAO_Policy_Remote_Proxy_Broker::CORBA_TAO_Policy_Remote_Proxy_Broker (void) +CORBA::_TAO_Policy_Remote_Proxy_Broker::_TAO_Policy_Remote_Proxy_Broker (void) { } -CORBA_TAO_Policy_Remote_Proxy_Broker::~CORBA_TAO_Policy_Remote_Proxy_Broker (void) +CORBA::_TAO_Policy_Remote_Proxy_Broker::~_TAO_Policy_Remote_Proxy_Broker (void) { } -CORBA_TAO_Policy_Proxy_Impl& -CORBA_TAO_Policy_Remote_Proxy_Broker::select_proxy ( +CORBA::_TAO_Policy_Proxy_Impl& +CORBA::_TAO_Policy_Remote_Proxy_Broker::select_proxy ( ::CORBA::Policy * ACE_ENV_ARG_DECL_NOT_USED ) @@ -1398,110 +1530,124 @@ CORBA_TAO_Policy_Remote_Proxy_Broker::select_proxy ( /////////////////////////////////////////////////////////////////////// -// default constructor -CORBA_Policy::CORBA_Policy (int collocated) +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +CORBA::Policy::Policy (int collocated) { this->CORBA_Policy_setup_collocation (collocated); } -// destructor -CORBA_Policy::~CORBA_Policy (void) +CORBA::Policy::~Policy (void) {} void -CORBA_Policy::CORBA_Policy_setup_collocation (int collocated) +CORBA::Policy::CORBA_Policy_setup_collocation (int collocated) { if (collocated) - this->the_CORBA_TAO_Policy_Proxy_Broker_ = - ::CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer (this); + this->the_TAO_Policy_Proxy_Broker_ = + ::CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer (this); else - this->the_CORBA_TAO_Policy_Proxy_Broker_ = - CORBA_TAO_Policy_Remote_Proxy_Broker::the_CORBA_TAO_Policy_Remote_Proxy_Broker (); + this->the_TAO_Policy_Proxy_Broker_ = + ::CORBA::_TAO_Policy_Remote_Proxy_Broker::the_TAO_Policy_Remote_Proxy_Broker (); } -void CORBA_Policy::_tao_any_destructor (void *x) +void CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer) { - CORBA_Policy *tmp = ACE_static_cast (CORBA_Policy*,x); + Policy *tmp = ACE_static_cast (Policy*, _tao_void_pointer); CORBA::release (tmp); } -CORBA::Policy_ptr CORBA_Policy::_narrow ( +CORBA::Policy_ptr CORBA::Policy::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) - return CORBA_Policy::_nil (); + return Policy::_nil (); if (! obj->_is_local ()) { CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_Policy::_nil ()); + ACE_CHECK_RETURN (Policy::_nil ()); if (is_a == 0) - return CORBA_Policy::_nil (); + return Policy::_nil (); } - return CORBA_Policy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return Policy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -CORBA::Policy_ptr CORBA_Policy::_unchecked_narrow ( +CORBA::Policy_ptr +CORBA::Policy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) - return CORBA_Policy::_nil (); - + return Policy::_nil (); if (! obj->_is_local ()) { TAO_Stub* stub = obj->_stubobj (); if (stub) stub->_incr_refcnt (); - - CORBA_Policy_ptr default_proxy = CORBA_Policy::_nil (); + Policy_ptr default_proxy = Policy::_nil (); if ( !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () &&CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer != 0 + obj->_is_collocated () && + CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer != 0 ) - { - ACE_NEW_RETURN ( - default_proxy, - ::CORBA::Policy ( - stub, - 1, - obj->_servant ()), - - CORBA_Policy::_nil ()); + { + ACE_NEW_RETURN ( + default_proxy, + ::CORBA::Policy ( + stub, + 1, + obj->_servant () + ), + Policy::_nil () + ); } + if (CORBA::is_nil (default_proxy)) - ACE_NEW_RETURN (default_proxy, ::CORBA::Policy (stub, 0, obj->_servant ()), CORBA_Policy::_nil ()); - return default_proxy; - } - else - return - ACE_reinterpret_cast - ( - CORBA_Policy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &CORBA_Policy::_tao_class_id - ) - ) - ); + { + ACE_NEW_RETURN ( + default_proxy, + ::CORBA::Policy ( + stub, + 0, + obj->_servant () + ), + Policy::_nil () + ); + } + + return default_proxy; + } + else + return + ACE_reinterpret_cast + ( + Policy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &Policy::_tao_class_id + ) + ) + ); } CORBA::Policy_ptr -CORBA_Policy::_duplicate (CORBA_Policy_ptr obj) +CORBA::Policy::_duplicate (Policy_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) +CORBA::Boolean CORBA::Policy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || @@ -1516,364 +1662,162 @@ void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type) void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_Policy::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, Policy)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; } -const char* CORBA_Policy::_interface_repository_id (void) const +const char* CORBA::Policy::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/Policy:1.0"; } +// **************************************************************** CORBA::Boolean -CORBA_Policy::_tao_encode (TAO_OutputCDR &) +CORBA::Policy::_tao_encode (TAO_OutputCDR &) { return 0; } CORBA::Boolean -CORBA_Policy::_tao_decode (TAO_InputCDR &) +CORBA::Policy::_tao_decode (TAO_InputCDR &) { return 0; } TAO_Cached_Policy_Type -CORBA_Policy::_tao_cached_type (void) const +CORBA::Policy::_tao_cached_type (void) const { - // By default, all policies are uncached. return TAO_CACHED_POLICY_UNCACHED; } TAO_Policy_Scope -CORBA_Policy::_tao_scope (void) const +CORBA::Policy::_tao_scope (void) const { return TAO_POLICY_DEFAULT_SCOPE; } +// **************************************************************** -CORBA::PolicyType CORBA_Policy::policy_type ( +CORBA::PolicyType CORBA::Policy::policy_type ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA_TAO_Policy_Proxy_Impl &proxy = - this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); + _TAO_Policy_Proxy_Impl &proxy = + this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return proxy.policy_type ( - this - ACE_ENV_ARG_PARAMETER + this ACE_ENV_ARG_PARAMETER ); } -CORBA::Policy_ptr CORBA_Policy::copy ( +::CORBA::Policy_ptr CORBA::Policy::copy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA_TAO_Policy_Proxy_Impl &proxy = - this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); + _TAO_Policy_Proxy_Impl &proxy = + this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return proxy.copy ( - this - ACE_ENV_ARG_PARAMETER + this ACE_ENV_ARG_PARAMETER ); } void CORBA::Policy::destroy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA_TAO_Policy_Proxy_Impl &proxy = - this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); + _TAO_Policy_Proxy_Impl &proxy = + this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.destroy ( - this - ACE_ENV_ARG_PARAMETER + this ACE_ENV_ARG_PARAMETER ); } -#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 - _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 - _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; - } - - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void) - { - this->_deallocate_buffer (); - } - - void - _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 - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast ( - void* target, - CORBA_Object *src - ACE_ENV_ARG_DECL - ) - { - CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target); - *tmp = CORBA::Policy::_narrow (src ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - CORBA_Object* - _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 */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYLIST_CS_) -#define _CORBA_POLICYLIST_CS_ - -// ************************************************************* -// CORBA::PolicyList -// ************************************************************* - -CORBA_PolicyList::CORBA_PolicyList (void) -{} -CORBA_PolicyList::CORBA_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<CORBA::Policy,CORBA::Policy_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} -CORBA_PolicyList::CORBA_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<CORBA::Policy,CORBA::Policy_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} -CORBA_PolicyList::CORBA_PolicyList (const CORBA_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<CORBA::Policy,CORBA::Policy_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} -CORBA_PolicyList::~CORBA_PolicyList (void) // dtor -{} -void CORBA_PolicyList::_tao_any_destructor (void *x) -{ - CORBA_PolicyList *tmp = ACE_static_cast (CORBA_PolicyList*,x); - delete tmp; -} - - -#endif /* end #if !defined */ - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_ - - void - _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 - _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; - } - - _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_ +static const CORBA::Long _oc_CORBA_Policy[] = +{ + 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 +}; -// ************************************************************* -// CORBA::PolicyTypeSeq -// ************************************************************* +static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy ( + CORBA::tk_objref, + sizeof (_oc_CORBA_Policy), + (char *) &_oc_CORBA_Policy, + 0, + sizeof (CORBA::Policy) + ); -CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (void) -{} -CORBA_PolicyTypeSeq::CORBA_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<CORBA::ULong> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} -CORBA_PolicyTypeSeq::CORBA_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<CORBA::ULong> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} -CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &seq) // copy ctor - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::ULong> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} -CORBA_PolicyTypeSeq::~CORBA_PolicyTypeSeq (void) // dtor -{} -void CORBA_PolicyTypeSeq::_tao_any_destructor (void *x) -{ - CORBA_PolicyTypeSeq *tmp = ACE_static_cast (CORBA_PolicyTypeSeq*,x); - delete tmp; -} +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 +int CORBA::PolicyManager::_tao_class_id = 0; -#endif /* end #if !defined */ - -CORBA_PolicyManager_ptr +CORBA::PolicyManager_ptr tao_CORBA_PolicyManager_duplicate ( - CORBA_PolicyManager_ptr p + CORBA::PolicyManager_ptr p ) { - return CORBA_PolicyManager::_duplicate (p); + return CORBA::PolicyManager::_duplicate (p); } void tao_CORBA_PolicyManager_release ( - CORBA_PolicyManager_ptr p + CORBA::PolicyManager_ptr p ) { CORBA::release (p); } -CORBA_PolicyManager_ptr +CORBA::PolicyManager_ptr tao_CORBA_PolicyManager_nil ( void ) { - return CORBA_PolicyManager::_nil (); + return CORBA::PolicyManager::_nil (); } -CORBA_PolicyManager_ptr +CORBA::PolicyManager_ptr tao_CORBA_PolicyManager_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return CORBA_PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1881,265 +1825,269 @@ tao_CORBA_PolicyManager_upcast ( void *src ) { - CORBA_PolicyManager **tmp = - ACE_static_cast (CORBA_PolicyManager **, src); + CORBA::PolicyManager **tmp = + ACE_static_cast (CORBA::PolicyManager **, src); return *tmp; } -int CORBA_PolicyManager::_tao_class_id = 0; - // ************************************************************* -// Operations for class CORBA_PolicyManager_var +// CORBA::PolicyManager_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* -CORBA_PolicyManager_var::CORBA_PolicyManager_var (void) // default constructor - : ptr_ (CORBA_PolicyManager::_nil ()) +CORBA::PolicyManager_var::PolicyManager_var (void) // default constructor + : ptr_ (PolicyManager::_nil ()) {} -::CORBA_PolicyManager_ptr -CORBA_PolicyManager_var::ptr (void) const +::CORBA::PolicyManager_ptr +CORBA::PolicyManager_var::ptr (void) const { return this->ptr_; } -CORBA_PolicyManager_var::CORBA_PolicyManager_var (const ::CORBA_PolicyManager_var &p) // copy constructor +CORBA::PolicyManager_var::PolicyManager_var (const ::CORBA::PolicyManager_var &p) // copy constructor : TAO_Base_var (), - ptr_ (CORBA_PolicyManager::_duplicate (p.ptr ())) + ptr_ (PolicyManager::_duplicate (p.ptr ())) {} -CORBA_PolicyManager_var::~CORBA_PolicyManager_var (void) // destructor +CORBA::PolicyManager_var::~PolicyManager_var (void) // destructor { CORBA::release (this->ptr_); } -CORBA_PolicyManager_var & -CORBA_PolicyManager_var::operator= (CORBA_PolicyManager_ptr p) +CORBA::PolicyManager_var & +CORBA::PolicyManager_var::operator= (PolicyManager_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -CORBA_PolicyManager_var & -CORBA_PolicyManager_var::operator= (const ::CORBA_PolicyManager_var &p) +CORBA::PolicyManager_var & +CORBA::PolicyManager_var::operator= (const ::CORBA::PolicyManager_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PolicyManager::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::PolicyManager::_duplicate (p.ptr ()); } return *this; } -CORBA_PolicyManager_var::operator const ::CORBA_PolicyManager_ptr &() const // cast +CORBA::PolicyManager_var::operator const ::CORBA::PolicyManager_ptr &() const // cast { return this->ptr_; } -CORBA_PolicyManager_var::operator ::CORBA_PolicyManager_ptr &() // cast +CORBA::PolicyManager_var::operator ::CORBA::PolicyManager_ptr &() // cast { return this->ptr_; } -::CORBA_PolicyManager_ptr -CORBA_PolicyManager_var::operator-> (void) const +::CORBA::PolicyManager_ptr +CORBA::PolicyManager_var::operator-> (void) const { return this->ptr_; } -::CORBA_PolicyManager_ptr -CORBA_PolicyManager_var::in (void) const +::CORBA::PolicyManager_ptr +CORBA::PolicyManager_var::in (void) const { return this->ptr_; } -::CORBA_PolicyManager_ptr & -CORBA_PolicyManager_var::inout (void) +::CORBA::PolicyManager_ptr & +CORBA::PolicyManager_var::inout (void) { return this->ptr_; } -::CORBA_PolicyManager_ptr & -CORBA_PolicyManager_var::out (void) +::CORBA::PolicyManager_ptr & +CORBA::PolicyManager_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PolicyManager::_nil (); + this->ptr_ = ::CORBA::PolicyManager::_nil (); return this->ptr_; } -::CORBA_PolicyManager_ptr -CORBA_PolicyManager_var::_retn (void) +::CORBA::PolicyManager_ptr +CORBA::PolicyManager_var::_retn (void) { // yield ownership of managed obj reference - ::CORBA_PolicyManager_ptr val = this->ptr_; - this->ptr_ = ::CORBA_PolicyManager::_nil (); + ::CORBA::PolicyManager_ptr val = this->ptr_; + this->ptr_ = ::CORBA::PolicyManager::_nil (); return val; } -::CORBA_PolicyManager_ptr -CORBA_PolicyManager_var::tao_duplicate (CORBA_PolicyManager_ptr p) +::CORBA::PolicyManager_ptr +CORBA::PolicyManager_var::tao_duplicate (PolicyManager_ptr p) { - return ::CORBA_PolicyManager::_duplicate (p); + return ::CORBA::PolicyManager::_duplicate (p); } void -CORBA_PolicyManager_var::tao_release (CORBA_PolicyManager_ptr p) +CORBA::PolicyManager_var::tao_release (PolicyManager_ptr p) { CORBA::release (p); } -::CORBA_PolicyManager_ptr -CORBA_PolicyManager_var::tao_nil (void) +::CORBA::PolicyManager_ptr +CORBA::PolicyManager_var::tao_nil (void) { - return ::CORBA_PolicyManager::_nil (); + return ::CORBA::PolicyManager::_nil (); } -::CORBA_PolicyManager_ptr -CORBA_PolicyManager_var::tao_narrow ( +::CORBA::PolicyManager_ptr +CORBA::PolicyManager_var::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA_PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::CORBA::PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA_PolicyManager_var::tao_upcast (void *src) +CORBA::PolicyManager_var::tao_upcast (void *src) { - CORBA_PolicyManager **tmp = - ACE_static_cast (CORBA_PolicyManager **, src); + PolicyManager **tmp = + ACE_static_cast (PolicyManager **, src); return *tmp; } // ************************************************************* -// Operations for class CORBA_PolicyManager_out +// CORBA::PolicyManager_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* -CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &p) +CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_ptr &p) : ptr_ (p) { - this->ptr_ = ::CORBA_PolicyManager::_nil (); + this->ptr_ = ::CORBA::PolicyManager::_nil (); } -CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_var &p) // constructor from _var +CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PolicyManager::_nil (); + this->ptr_ = ::CORBA::PolicyManager::_nil (); } -CORBA_PolicyManager_out::CORBA_PolicyManager_out (const ::CORBA_PolicyManager_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_PolicyManager_out &, p).ptr_) +CORBA::PolicyManager_out::PolicyManager_out (const ::CORBA::PolicyManager_out &p) // copy constructor + : ptr_ (ACE_const_cast (PolicyManager_out &, p).ptr_) {} -::CORBA_PolicyManager_out & -CORBA_PolicyManager_out::operator= (const ::CORBA_PolicyManager_out &p) +::CORBA::PolicyManager_out & +CORBA::PolicyManager_out::operator= (const ::CORBA::PolicyManager_out &p) { - this->ptr_ = ACE_const_cast (CORBA_PolicyManager_out&, p).ptr_; + this->ptr_ = ACE_const_cast (PolicyManager_out&, p).ptr_; return *this; } -CORBA_PolicyManager_out & -CORBA_PolicyManager_out::operator= (const ::CORBA_PolicyManager_var &p) +CORBA::PolicyManager_out & +CORBA::PolicyManager_out::operator= (const ::CORBA::PolicyManager_var &p) { - this->ptr_ = ::CORBA_PolicyManager::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::PolicyManager::_duplicate (p.ptr ()); return *this; } -CORBA_PolicyManager_out & -CORBA_PolicyManager_out::operator= (CORBA_PolicyManager_ptr p) +CORBA::PolicyManager_out & +CORBA::PolicyManager_out::operator= (PolicyManager_ptr p) { this->ptr_ = p; return *this; } -CORBA_PolicyManager_out::operator ::CORBA_PolicyManager_ptr &() // cast +CORBA::PolicyManager_out::operator ::CORBA::PolicyManager_ptr &() // cast { return this->ptr_; } -::CORBA_PolicyManager_ptr & -CORBA_PolicyManager_out::ptr (void) // ptr +::CORBA::PolicyManager_ptr & +CORBA::PolicyManager_out::ptr (void) // ptr { return this->ptr_; } -::CORBA_PolicyManager_ptr -CORBA_PolicyManager_out::operator-> (void) +::CORBA::PolicyManager_ptr +CORBA::PolicyManager_out::operator-> (void) { return this->ptr_; } -// default constructor -CORBA_PolicyManager::CORBA_PolicyManager () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 -// destructor -CORBA_PolicyManager::~CORBA_PolicyManager (void) +CORBA::PolicyManager::PolicyManager (void) {} -CORBA_PolicyManager_ptr CORBA_PolicyManager::_narrow ( +CORBA::PolicyManager::~PolicyManager (void) +{} + +CORBA::PolicyManager_ptr CORBA::PolicyManager::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) { - return CORBA::PolicyManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return PolicyManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow ( +CORBA::PolicyManager_ptr +CORBA::PolicyManager::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) - return CORBA_PolicyManager::_nil (); - + return PolicyManager::_nil (); return ACE_reinterpret_cast ( - CORBA_PolicyManager_ptr, + PolicyManager_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( ptr_arith_t, - &CORBA_PolicyManager::_tao_class_id + &PolicyManager::_tao_class_id ) ) ); } -CORBA_PolicyManager_ptr -CORBA_PolicyManager::_duplicate (CORBA_PolicyManager_ptr obj) +CORBA::PolicyManager_ptr +CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -void *CORBA_PolicyManager::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::PolicyManager::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_PolicyManager::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) 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 +const char* CORBA::PolicyManager::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/PolicyManager:1.0"; } +int CORBA::PolicyCurrent::_tao_class_id = 0; + CORBA::PolicyCurrent_ptr tao_CORBA_PolicyCurrent_duplicate ( CORBA::PolicyCurrent_ptr p @@ -2161,16 +2109,16 @@ tao_CORBA_PolicyCurrent_nil ( void ) { - return CORBA_PolicyCurrent::_nil (); + return CORBA::PolicyCurrent::_nil (); } -CORBA_PolicyCurrent_ptr +CORBA::PolicyCurrent_ptr tao_CORBA_PolicyCurrent_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return CORBA_PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2178,266 +2126,268 @@ tao_CORBA_PolicyCurrent_upcast ( void *src ) { - CORBA_PolicyCurrent **tmp = - ACE_static_cast (CORBA_PolicyCurrent **, src); + CORBA::PolicyCurrent **tmp = + ACE_static_cast (CORBA::PolicyCurrent **, src); return *tmp; } -int CORBA_PolicyCurrent::_tao_class_id = 0; - // ************************************************************* -// Operations for class CORBA_PolicyCurrent_var +// CORBA::PolicyCurrent_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* -CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (void) // default constructor - : ptr_ (CORBA_PolicyCurrent::_nil ()) +CORBA::PolicyCurrent_var::PolicyCurrent_var (void) // default constructor + : ptr_ (PolicyCurrent::_nil ()) {} -::CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent_var::ptr (void) const +::CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent_var::ptr (void) const { return this->ptr_; } -CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (const ::CORBA_PolicyCurrent_var &p) // copy constructor +CORBA::PolicyCurrent_var::PolicyCurrent_var (const ::CORBA::PolicyCurrent_var &p) // copy constructor : TAO_Base_var (), - ptr_ (CORBA_PolicyCurrent::_duplicate (p.ptr ())) + ptr_ (PolicyCurrent::_duplicate (p.ptr ())) {} -CORBA_PolicyCurrent_var::~CORBA_PolicyCurrent_var (void) // destructor +CORBA::PolicyCurrent_var::~PolicyCurrent_var (void) // destructor { CORBA::release (this->ptr_); } -CORBA_PolicyCurrent_var & -CORBA_PolicyCurrent_var::operator= (CORBA_PolicyCurrent_ptr p) +CORBA::PolicyCurrent_var & +CORBA::PolicyCurrent_var::operator= (PolicyCurrent_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -CORBA_PolicyCurrent_var & -CORBA_PolicyCurrent_var::operator= (const ::CORBA_PolicyCurrent_var &p) +CORBA::PolicyCurrent_var & +CORBA::PolicyCurrent_var::operator= (const ::CORBA::PolicyCurrent_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PolicyCurrent::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::PolicyCurrent::_duplicate (p.ptr ()); } return *this; } -CORBA_PolicyCurrent_var::operator const ::CORBA_PolicyCurrent_ptr &() const // cast +CORBA::PolicyCurrent_var::operator const ::CORBA::PolicyCurrent_ptr &() const // cast { return this->ptr_; } -CORBA_PolicyCurrent_var::operator ::CORBA_PolicyCurrent_ptr &() // cast +CORBA::PolicyCurrent_var::operator ::CORBA::PolicyCurrent_ptr &() // cast { return this->ptr_; } -::CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent_var::operator-> (void) const +::CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent_var::operator-> (void) const { return this->ptr_; } -::CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent_var::in (void) const +::CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent_var::in (void) const { return this->ptr_; } -::CORBA_PolicyCurrent_ptr & -CORBA_PolicyCurrent_var::inout (void) +::CORBA::PolicyCurrent_ptr & +CORBA::PolicyCurrent_var::inout (void) { return this->ptr_; } -::CORBA_PolicyCurrent_ptr & -CORBA_PolicyCurrent_var::out (void) +::CORBA::PolicyCurrent_ptr & +CORBA::PolicyCurrent_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PolicyCurrent::_nil (); + this->ptr_ = ::CORBA::PolicyCurrent::_nil (); return this->ptr_; } -::CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent_var::_retn (void) +::CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent_var::_retn (void) { // yield ownership of managed obj reference - ::CORBA_PolicyCurrent_ptr val = this->ptr_; - this->ptr_ = ::CORBA_PolicyCurrent::_nil (); + ::CORBA::PolicyCurrent_ptr val = this->ptr_; + this->ptr_ = ::CORBA::PolicyCurrent::_nil (); return val; } -::CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent_var::tao_duplicate (CORBA_PolicyCurrent_ptr p) +::CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent_var::tao_duplicate (PolicyCurrent_ptr p) { - return ::CORBA_PolicyCurrent::_duplicate (p); + return ::CORBA::PolicyCurrent::_duplicate (p); } void -CORBA_PolicyCurrent_var::tao_release (CORBA_PolicyCurrent_ptr p) +CORBA::PolicyCurrent_var::tao_release (PolicyCurrent_ptr p) { CORBA::release (p); } -::CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent_var::tao_nil (void) +::CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent_var::tao_nil (void) { - return ::CORBA_PolicyCurrent::_nil (); + return ::CORBA::PolicyCurrent::_nil (); } -::CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent_var::tao_narrow ( +::CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent_var::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA_PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::CORBA::PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA_PolicyCurrent_var::tao_upcast (void *src) +CORBA::PolicyCurrent_var::tao_upcast (void *src) { - CORBA_PolicyCurrent **tmp = - ACE_static_cast (CORBA_PolicyCurrent **, src); + PolicyCurrent **tmp = + ACE_static_cast (PolicyCurrent **, src); return *tmp; } // ************************************************************* -// Operations for class CORBA_PolicyCurrent_out +// CORBA::PolicyCurrent_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* -CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &p) +CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_ptr &p) : ptr_ (p) { - this->ptr_ = ::CORBA_PolicyCurrent::_nil (); + this->ptr_ = ::CORBA::PolicyCurrent::_nil (); } -CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_var &p) // constructor from _var +CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PolicyCurrent::_nil (); + this->ptr_ = ::CORBA::PolicyCurrent::_nil (); } -CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (const ::CORBA_PolicyCurrent_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_PolicyCurrent_out &, p).ptr_) +CORBA::PolicyCurrent_out::PolicyCurrent_out (const ::CORBA::PolicyCurrent_out &p) // copy constructor + : ptr_ (ACE_const_cast (PolicyCurrent_out &, p).ptr_) {} -::CORBA_PolicyCurrent_out & -CORBA_PolicyCurrent_out::operator= (const ::CORBA_PolicyCurrent_out &p) +::CORBA::PolicyCurrent_out & +CORBA::PolicyCurrent_out::operator= (const ::CORBA::PolicyCurrent_out &p) { - this->ptr_ = ACE_const_cast (CORBA_PolicyCurrent_out&, p).ptr_; + this->ptr_ = ACE_const_cast (PolicyCurrent_out&, p).ptr_; return *this; } -CORBA_PolicyCurrent_out & -CORBA_PolicyCurrent_out::operator= (const ::CORBA_PolicyCurrent_var &p) +CORBA::PolicyCurrent_out & +CORBA::PolicyCurrent_out::operator= (const ::CORBA::PolicyCurrent_var &p) { - this->ptr_ = ::CORBA_PolicyCurrent::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::PolicyCurrent::_duplicate (p.ptr ()); return *this; } -CORBA_PolicyCurrent_out & -CORBA_PolicyCurrent_out::operator= (CORBA_PolicyCurrent_ptr p) +CORBA::PolicyCurrent_out & +CORBA::PolicyCurrent_out::operator= (PolicyCurrent_ptr p) { this->ptr_ = p; return *this; } -CORBA_PolicyCurrent_out::operator ::CORBA_PolicyCurrent_ptr &() // cast +CORBA::PolicyCurrent_out::operator ::CORBA::PolicyCurrent_ptr &() // cast { return this->ptr_; } -::CORBA_PolicyCurrent_ptr & -CORBA_PolicyCurrent_out::ptr (void) // ptr +::CORBA::PolicyCurrent_ptr & +CORBA::PolicyCurrent_out::ptr (void) // ptr { return this->ptr_; } -::CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent_out::operator-> (void) +::CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent_out::operator-> (void) { return this->ptr_; } -// default constructor -CORBA_PolicyCurrent::CORBA_PolicyCurrent () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +CORBA::PolicyCurrent::PolicyCurrent (void) +{} -// destructor -CORBA_PolicyCurrent::~CORBA_PolicyCurrent (void) +CORBA::PolicyCurrent::~PolicyCurrent (void) {} -CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow ( +CORBA::PolicyCurrent_ptr CORBA::PolicyCurrent::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) { - return CORBA_PolicyCurrent::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return PolicyCurrent::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow ( +CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) - return CORBA_PolicyCurrent::_nil (); - + return PolicyCurrent::_nil (); return ACE_reinterpret_cast ( - CORBA_PolicyCurrent_ptr, + PolicyCurrent_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( ptr_arith_t, - &CORBA_PolicyCurrent::_tao_class_id + &PolicyCurrent::_tao_class_id ) ) ); } -CORBA_PolicyCurrent_ptr -CORBA_PolicyCurrent::_duplicate (CORBA_PolicyCurrent_ptr obj) +CORBA::PolicyCurrent_ptr +CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -void *CORBA_PolicyCurrent::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::PolicyCurrent::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_PolicyCurrent::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, PolicyCurrent)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_PolicyManager::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id)) retv = ACE_reinterpret_cast ( void *, ACE_static_cast ( - CORBA_PolicyManager_ptr, + CORBA::PolicyManager_ptr, this ) ); else if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_Current::_tao_class_id)) + &::CORBA::Current::_tao_class_id)) retv = ACE_reinterpret_cast ( void *, @@ -2450,13 +2400,13 @@ void *CORBA_PolicyCurrent::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) 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 +const char* CORBA::PolicyCurrent::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/PolicyCurrent:1.0"; } @@ -2500,13 +2450,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyError ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (CORBA::PolicyError *)_tao_any.value (); @@ -2551,7 +2501,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyError return 0; } -void operator<<= (CORBA::Any &_tao_any, const CORBA_InvalidPolicies &_tao_elem) // copying +void operator<<= (CORBA::Any &_tao_any, const CORBA::InvalidPolicies &_tao_elem) // copying { TAO_OutputCDR stream; stream << _tao_elem; @@ -2562,7 +2512,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA_InvalidPolicies &_tao_elem) ); } -void operator<<= (CORBA::Any &_tao_any, CORBA_InvalidPolicies *_tao_elem) // non copying +void operator<<= (CORBA::Any &_tao_any, CORBA::InvalidPolicies *_tao_elem) // non copying { TAO_OutputCDR stream; stream << *_tao_elem; @@ -2572,40 +2522,40 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_InvalidPolicies *_tao_elem) // non stream.begin (), 1, _tao_elem, - CORBA_InvalidPolicies::_tao_any_destructor + CORBA::InvalidPolicies::_tao_any_destructor ); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InvalidPolicies *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InvalidPolicies *&_tao_elem) { return _tao_any >>= ACE_const_cast( - const CORBA_InvalidPolicies*&, + const CORBA::InvalidPolicies*&, _tao_elem ); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InvalidPolicies *&_tao_elem) +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 (); - + CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { - _tao_elem = (CORBA_InvalidPolicies *)_tao_any.value (); + _tao_elem = (CORBA::InvalidPolicies *)_tao_any.value (); return 1; } else { - CORBA_InvalidPolicies *tmp; - ACE_NEW_RETURN (tmp, CORBA_InvalidPolicies, 0); + CORBA::InvalidPolicies *tmp; + ACE_NEW_RETURN (tmp, CORBA::InvalidPolicies, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -2623,7 +2573,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InvalidPolic CORBA::_tc_InvalidPolicies, 1, tmp, - CORBA_InvalidPolicies::_tao_any_destructor + CORBA::InvalidPolicies::_tao_any_destructor ); _tao_elem = tmp; return 1; @@ -2647,7 +2597,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::Policy_ptr _tao_elem) if (stream << _tao_elem) { _tao_any._tao_replace ( - CORBA::_tc_Policy, + CORBA::_tc_Policy, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, @@ -2663,13 +2613,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_ { _tao_elem = CORBA::Policy::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -2702,240 +2652,18 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_ # pragma instantiate TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -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 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) -{ - return _tao_any >>= ACE_const_cast( - const CORBA::PolicyList*&, - _tao_elem - ); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList *&_tao_elem) -{ - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - - CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (!result) - return 0; // not equivalent - - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const CORBA::PolicyList*, - _tao_any.value () - ); - return 1; - } - else - { - CORBA::PolicyList *tmp; - ACE_NEW_RETURN (tmp, CORBA::PolicyList, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_PolicyList, - 1, - ACE_static_cast (void *, tmp), - CORBA::PolicyList::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - 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 (); - - CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (!result) - return 0; // not equivalent - - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const CORBA::PolicyTypeSeq*, - _tao_any.value () - ); - return 1; - } - else - { - CORBA::PolicyTypeSeq *tmp; - ACE_NEW_RETURN (tmp, CORBA::PolicyTypeSeq, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_PolicyTypeSeq, - 1, - ACE_static_cast (void *, tmp), - CORBA::PolicyTypeSeq::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; -} - -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 () - ); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - - CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (!result) - return 0; // not equivalent - - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> _tao_elem) - { - return 1; - } - } - ACE_CATCHANY - { - return 0; - } - ACE_ENDTRY; - return 0; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_PolicyManager,CORBA_PolicyManager_var>; + template class TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA_PolicyManager,CORBA_PolicyManager_var> + # pragma instantiate TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>; + template class TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var> + # pragma instantiate TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -2944,7 +2672,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType & CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const CORBA_InvalidPolicies::_tao_seq_UShort &_tao_sequence + const CORBA::InvalidPolicies::_tao_seq_UShort &_tao_sequence ) { if (strm << _tao_sequence.length ()) @@ -2957,7 +2685,7 @@ CORBA::Boolean operator<< ( CORBA::Boolean operator>> ( TAO_InputCDR &strm, - CORBA_InvalidPolicies::_tao_seq_UShort &_tao_sequence + CORBA::InvalidPolicies::_tao_seq_UShort &_tao_sequence ) { CORBA::ULong _tao_seq_len; @@ -2966,7 +2694,7 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; // Add a check to the length of the sequence // to make sure it does not exceed the length @@ -3004,7 +2732,7 @@ CORBA::Boolean operator>> ( _tao_objref = CORBA::Policy::_unchecked_narrow ( obj.in () - ACE_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -3017,86 +2745,3 @@ CORBA::Boolean operator>> ( return 0; } -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 -} - -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; - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length()) - return 0; - // 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 -} - -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 -} - -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; - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length()) - return 0; - // retrieve all the elements - return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - return 0; // error -} diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 0480c095dca..c05b50ddffa 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -23,20 +23,18 @@ #define _TAO_IDL_ORIG_POLICYC_H_ #include "ace/pre.h" - -#include "TAO_Export.h" +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Encodable.h" +#include "TAO_Export.h" +#include "CurrentC.h" +#include "Policy_ForwardC.h" #include "Exception.h" -#include "Environment.h" -#include "Sequence.h" -#include "CDR.h" #include "Remote_Object_Proxy_Impl.h" -#include "CurrentC.h" +#include "Encodable.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -61,26 +59,43 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_NAMESPACE CORBA +{ + 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; + + 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; + + #if !defined (_CORBA_POLICYERROR_CH_) #define _CORBA_POLICYERROR_CH_ + + class TAO_Export PolicyError : public CORBA::UserException + { + public: + ACE_NESTED_CLASS (CORBA, PolicyErrorCode) reason; + + PolicyError (void); + PolicyError (const PolicyError &); + ~PolicyError (void); -class TAO_Export CORBA_PolicyError : public CORBA::UserException -{ -public: - CORBA::PolicyErrorCode reason; - - CORBA_PolicyError (void); - // Default constructor. - - CORBA_PolicyError (const CORBA_PolicyError &); - // Copy constructor. - - ~CORBA_PolicyError (void); - // Destructor. + PolicyError &operator= (const PolicyError &); static void _tao_any_destructor (void*); - CORBA_PolicyError &operator= (const CORBA_PolicyError &); + static PolicyError *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -88,132 +103,136 @@ public: TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - - static CORBA_PolicyError *_downcast (CORBA::Exception *); - - CORBA_PolicyError ( - CORBA::PolicyErrorCode _tao_reason + + PolicyError ( + ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason ); - - // = TAO extension. - static CORBA::Exception *_alloc (void); + virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception CORBA::PolicyError. - + }; +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_INVALIDPOLICIES_CH_) #define _CORBA_INVALIDPOLICIES_CH_ - - class TAO_Export CORBA_InvalidPolicies : public CORBA::UserException + + class TAO_Export 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 - { - 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, + + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); + _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::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); + + // = 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); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + 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); - }; - + CORBA::Boolean release + ); + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#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 + + class TAO_Export _tao_seq_UShort : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort + _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::UShort> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::UShort> +#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 - ); + 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 */ - + + #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef _tao_seq_UShort _indices_seq; - #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ - - _tao_seq_UShort indices; - - CORBA_InvalidPolicies (void); - // Default constructor. +#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ - CORBA_InvalidPolicies (const CORBA_InvalidPolicies &); - // Copy constructor. + _tao_seq_UShort indices; + + InvalidPolicies (void); + InvalidPolicies (const InvalidPolicies &); + ~InvalidPolicies (void); - ~CORBA_InvalidPolicies (void); - // Destructor. + InvalidPolicies &operator= (const InvalidPolicies &); static void _tao_any_destructor (void*); - CORBA_InvalidPolicies &operator= (const CORBA_InvalidPolicies &); + static InvalidPolicies *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -221,897 +240,656 @@ public: TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - - static CORBA_InvalidPolicies *_downcast (CORBA::Exception *); - - CORBA_InvalidPolicies ( + + InvalidPolicies ( const _tao_seq_UShort & _tao_indices ); - - // = TAO extension. - static CORBA::Exception *_alloc (void); + virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception CORBA::InvalidPolicies. - + }; +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies; + + #endif /* end #if !defined */ - + + +#if !defined (_CORBA_POLICY___PTR_CH_) +#define _CORBA_POLICY___PTR_CH_ + + class Policy; + typedef Policy *Policy_ptr; + +#endif /* end #if !defined */ + + #if !defined (_CORBA_POLICY___VAR_CH_) #define _CORBA_POLICY___VAR_CH_ - - class TAO_Export CORBA_Policy_var : public TAO_Base_var + + class TAO_Export Policy_var : public TAO_Base_var { public: - 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; - + Policy_var (void); // default constructor + Policy_var (Policy_ptr p) : ptr_ (p) {} + 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; + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. - static CORBA_Policy_ptr tao_duplicate (CORBA_Policy_ptr); - static void tao_release (CORBA_Policy_ptr); - static CORBA_Policy_ptr tao_nil (void); - static CORBA_Policy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static Policy_ptr tao_duplicate (Policy_ptr); + static void tao_release (Policy_ptr); + static Policy_ptr tao_nil (void); + static Policy_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); - + private: - CORBA_Policy_ptr ptr_; + Policy_ptr ptr_; // Unimplemented - prevents widening assignment. - CORBA_Policy_var (const TAO_Base_var &rhs); - CORBA_Policy_var &operator= (const TAO_Base_var &rhs); + Policy_var (const TAO_Base_var &rhs); + 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 CORBA_Policy_out + + class TAO_Export Policy_out { public: - CORBA_Policy_out (CORBA_Policy_ptr &); - CORBA_Policy_out (CORBA_Policy_var &); - CORBA_Policy_out (const CORBA_Policy_out &); - CORBA_Policy_out &operator= (const 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); - + 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); + private: - CORBA_Policy_ptr &ptr_; + Policy_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLICY_CH_) #define _CORBA_POLICY_CH_ - - // Forward Classes Declaration - class CORBA_TAO_Policy_Proxy_Impl; - class CORBA_TAO_Policy_Remote_Proxy_Impl; - class CORBA_TAO_Policy_Proxy_Broker; - class CORBA_TAO_Policy_Remote_Proxy_Broker; - -class TAO_Export CORBA_Policy - : public virtual CORBA_Object, - public virtual TAO_Encodable + + // Forward Classes Declaration. + class _TAO_Policy_Proxy_Impl; + class _TAO_Policy_Remote_Proxy_Impl; + class _TAO_Policy_Proxy_Broker; + class _TAO_Policy_Remote_Proxy_Broker; + + class TAO_Export Policy + : public virtual CORBA_Object + // **************************************************************** + , public virtual TAO_Encodable + // **************************************************************** { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_Policy_ptr _ptr_type; - typedef CORBA_Policy_var _var_type; + typedef Policy_ptr _ptr_type; + typedef Policy_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; - - // the static operations - static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj); - static CORBA_Policy_ptr _narrow ( + static int _tao_class_id; + + // The static operations. + static Policy_ptr _duplicate (Policy_ptr obj); + + static Policy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_Policy_ptr _unchecked_narrow ( + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static Policy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_Policy_ptr _nil (void) + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static Policy_ptr _nil (void) { - return (CORBA_Policy_ptr)0; + return (Policy_ptr)0; } - + static void _tao_any_destructor (void*); - + virtual CORBA::PolicyType policy_type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - virtual CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + virtual ::CORBA::Policy_ptr copy ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; + // **************************************************************** virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &); virtual CORBA::Boolean _tao_decode (TAO_InputCDR &); - - // Return the cached policy type for this policy. See orbconf.h. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; - - // Returns the scope at which this policy can be applied. See orbconf.h. virtual TAO_Policy_Scope _tao_scope (void) const; + // **************************************************************** private: - CORBA_TAO_Policy_Proxy_Broker *the_CORBA_TAO_Policy_Proxy_Broker_; - + _TAO_Policy_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; + protected: - CORBA_Policy (int collocated = 0); - - protected: - // This methods travese the inheritance tree and set the - // parents piece of the given class in the right mode - virtual void CORBA_Policy_setup_collocation (int collocated); - - CORBA_Policy ( - TAO_Stub *objref, + Policy (int collocated = 0); + + // These methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void CORBA_Policy_setup_collocation (int collocated); + + Policy ( + TAO_Stub *objref, CORBA::Boolean _tao_collocated = 0, TAO_Abstract_ServantBase *servant = 0 - ); - - friend class CORBA_TAO_Policy_Remote_Proxy_Impl; - friend class CORBA_TAO_Policy_ThruPOA_Proxy_Impl; - friend class CORBA_TAO_Policy_Direct_Proxy_Impl; - - virtual ~CORBA_Policy (void); + ); + + friend class _TAO_Policy_Remote_Proxy_Impl; + friend class _TAO_Policy_ThruPOA_Proxy_Impl; + friend class _TAO_Policy_Direct_Proxy_Impl; + + virtual ~Policy (void); + private: - CORBA_Policy (const CORBA_Policy &); - void operator= (const CORBA_Policy &); + Policy (const Policy &); + void operator= (const Policy &); }; - - -// The Proxy Implementations are used by each interface to -// perform a call. Each different implementation encapsulate -// an invocation logics. - - + + // The Proxy Implementations are used by each interface to + // perform a call. Each different implementation encapsulate + // an invocation logics. + + /////////////////////////////////////////////////////////////////////// - // Base Impl. Declaration + // Base Proxy Impl. Declaration // - - class TAO_Export CORBA_TAO_Policy_Proxy_Impl : public virtual TAO_Object_Proxy_Impl + + class TAO_Export _TAO_Policy_Proxy_Impl + : public virtual TAO_Object_Proxy_Impl { public: - virtual ~CORBA_TAO_Policy_Proxy_Impl (void) { } - - virtual CORBA::PolicyType policy_type ( - CORBA::Object_ptr _collocated_tao_target_ + virtual ~_TAO_Policy_Proxy_Impl (void) { } + virtual CORBA::PolicyType policy_type ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - virtual CORBA::Policy_ptr copy ( - CORBA::Object_ptr _collocated_tao_target_ + + virtual ::CORBA::Policy_ptr copy ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void destroy ( - CORBA::Object_ptr _collocated_tao_target_ + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - -protected: - CORBA_TAO_Policy_Proxy_Impl (void); - + + + protected: + _TAO_Policy_Proxy_Impl (void); }; + // - // Base Proxy Impl. Declaration + // End Base Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////// -// Remote Impl. Declaration -// - -class TAO_Export CORBA_TAO_Policy_Remote_Proxy_Impl : - public virtual CORBA_TAO_Policy_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl -{ -public: - CORBA_TAO_Policy_Remote_Proxy_Impl (void); - - virtual ~CORBA_TAO_Policy_Remote_Proxy_Impl (void) { } - - virtual CORBA::PolicyType policy_type ( - CORBA::Object_ptr _collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual CORBA::Policy_ptr copy ( - CORBA::Object_ptr _collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void destroy ( - CORBA::Object_ptr _collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -}; - -// -// Base Proxy Impl. Declaration -/////////////////////////////////////////////////////////////////////// - - -// The Proxy Brokers are used by each interface to get -// the right proxy for performing a call. In the new -// collocation scheme, the proxy to be used can vary on -// a call by call basis. - - - -/////////////////////////////////////////////////////////////////////// -// Base Proxy Broker Declaration -// - -class TAO_Export CORBA_TAO_Policy_Proxy_Broker -{ -public: - virtual ~CORBA_TAO_Policy_Proxy_Broker (void); - virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( - CORBA_Policy *object - ACE_ENV_ARG_DECL - ) = 0; - -protected: - CORBA_TAO_Policy_Proxy_Broker (void); - -}; - -// -// End Base Proxy Broker Declaration -/////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////// -// Remote Proxy Broker Declaration -// - -class TAO_Export CORBA_TAO_Policy_Remote_Proxy_Broker : public virtual CORBA_TAO_Policy_Proxy_Broker -{ -public: - CORBA_TAO_Policy_Remote_Proxy_Broker (void); - - virtual ~CORBA_TAO_Policy_Remote_Proxy_Broker (void); - - virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( - CORBA_Policy *object - ACE_ENV_ARG_DECL - ); - -private: - CORBA_TAO_Policy_Remote_Proxy_Impl remote_proxy_impl_; -// This member function is used to get an handle to the unique instance -// of the Remote Proxy Broker that is available for a given -// interface. - -public: - static CORBA_TAO_Policy_Remote_Proxy_Broker *the_CORBA_TAO_Policy_Remote_Proxy_Broker (void); -}; - - -// -// End Remote Proxy Broker Declaration -/////////////////////////////////////////////////////////////////////// - - -#endif /* end #if !defined */ - - -#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_EXPORT_NESTED_MACRO _TAO_Unbounded_Object_Sequence_CORBA_PolicyList : public TAO_Unbounded_Base_Sequence + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Impl. Declaration + // + + class TAO_Export _TAO_Policy_Remote_Proxy_Impl + : public virtual _TAO_Policy_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl { 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, - CORBA_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<CORBA::Policy,CORBA::Policy_var> operator[] (CORBA::ULong index) const; - static CORBA_Policy **allocbuf (CORBA::ULong nelems); - static void freebuf (CORBA_Policy **buffer); - // The Base_Sequence functions, please see tao/Sequence.h - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - CORBA_Policy* *get_buffer (CORBA::Boolean orphan = 0); - const CORBA_Policy* *get_buffer (void) const; - virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol); - virtual void _downcast ( - void* target, - CORBA_Object *src - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - virtual CORBA_Object* _upcast (void *src) const; - + _TAO_Policy_Remote_Proxy_Impl (void); + + virtual ~_TAO_Policy_Remote_Proxy_Impl (void) { } + virtual CORBA::PolicyType policy_type ( + CORBA_Object *_collocated_tao_target_ + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual ::CORBA::Policy_ptr copy ( + CORBA_Object *_collocated_tao_target_ + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void destroy ( + CORBA_Object *_collocated_tao_target_ + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + }; - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYLIST_CH_) -#define _CORBA_POLICYLIST_CH_ - -// ************************************************************* -// PolicyList -// ************************************************************* - -class TAO_Export CORBA_PolicyList : public -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -{ -public: - 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); - static void _tao_any_destructor (void*); - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_PolicyList_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - -}; - -#endif /* end #if !defined */ - - -#if !defined (_CORBA_POLICYLIST___VAR_CH_) -#define _CORBA_POLICYLIST___VAR_CH_ - -// ************************************************************* -// class CORBA::PolicyList_var -// ************************************************************* - -class TAO_Export CORBA_PolicyList_var -{ -public: - 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; - - operator const CORBA_PolicyList &() const; - operator CORBA_PolicyList &(); - operator CORBA_PolicyList &() const; - operator CORBA_PolicyList *&(); // variable-size base types only - - TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> 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_; -}; - - -#endif /* end #if !defined */ - - -#if !defined (_CORBA_POLICYLIST___OUT_CH_) -#define _CORBA_POLICYLIST___OUT_CH_ - -class TAO_Export CORBA_PolicyList_out -{ -public: - CORBA_PolicyList_out (CORBA_PolicyList *&); - CORBA_PolicyList_out (CORBA_PolicyList_var &); - CORBA_PolicyList_out (const CORBA_PolicyList_out &); - CORBA_PolicyList_out &operator= (const CORBA_PolicyList_out &); - CORBA_PolicyList_out &operator= (CORBA_PolicyList *); - operator CORBA_PolicyList *&(); - CORBA_PolicyList *&ptr (void); - CORBA_PolicyList *operator-> (void); - TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> operator[] (CORBA::ULong index); - -private: - CORBA_PolicyList *&ptr_; - // assignment from T_var not allowed - void operator= (const CORBA_PolicyList_var &); -}; - - -#endif /* end #if !defined */ - - -#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 + + // + // End Remote Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + + // The Proxy Brokers are used by each interface to get + // the right proxy for performing a call. In the new + // collocation scheme, the proxy to be used can vary on + // a call by call basis. + + + /////////////////////////////////////////////////////////////////////// + // Base Proxy Broker Declaration + // + + class TAO_Export _TAO_Policy_Proxy_Broker { 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); + virtual ~_TAO_Policy_Proxy_Broker (void); + virtual _TAO_Policy_Proxy_Impl &select_proxy ( + Policy *object + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) = 0; + + protected: + _TAO_Policy_Proxy_Broker (void); + }; - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYTYPESEQ_CH_) -#define _CORBA_POLICYTYPESEQ_CH_ - -class CORBA_PolicyTypeSeq; -class CORBA_PolicyTypeSeq_var; - -// ************************************************************* -// PolicyTypeSeq -// ************************************************************* - -class TAO_Export CORBA_PolicyTypeSeq : public -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::ULong> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -{ -public: - 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); - static void _tao_any_destructor (void*); - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_PolicyTypeSeq_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - -}; - -#endif /* end #if !defined */ - - -#if !defined (_CORBA_POLICYTYPESEQ___VAR_CH_) -#define _CORBA_POLICYTYPESEQ___VAR_CH_ - -// ************************************************************* -// class CORBA::PolicyTypeSeq_var -// ************************************************************* - -class TAO_Export CORBA_PolicyTypeSeq_var -{ -public: - CORBA_PolicyTypeSeq_var (void); // default constructor - CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *); - CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &); // copy constructor - CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq &); // fixed-size base types only - ~CORBA_PolicyTypeSeq_var (void); // destructor - - CORBA_PolicyTypeSeq_var &operator= (CORBA_PolicyTypeSeq *); - CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq_var &); - CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq &); // fixed-size base types only - 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 index); - const CORBA::PolicyType & operator[] (CORBA::ULong index) const; - - // 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; - -private: - CORBA_PolicyTypeSeq *ptr_; -}; - - + + // + // End Base Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Broker Declaration + // + + class TAO_Export _TAO_Policy_Remote_Proxy_Broker + : public virtual _TAO_Policy_Proxy_Broker + { + public: + _TAO_Policy_Remote_Proxy_Broker (void); + + virtual ~_TAO_Policy_Remote_Proxy_Broker (void); + + virtual _TAO_Policy_Proxy_Impl &select_proxy ( + Policy *object + ACE_ENV_ARG_DECL + ); + + private: + _TAO_Policy_Remote_Proxy_Impl remote_proxy_impl_; + + public: + // This member function is used to get an handle to the unique instance + // of the Remote Proxy Broker that is available for a given + // interface. + static _TAO_Policy_Remote_Proxy_Broker *the_TAO_Policy_Remote_Proxy_Broker (void); + }; + + // + // End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + #endif /* end #if !defined */ - - -#if !defined (_CORBA_POLICYTYPESEQ___OUT_CH_) -#define _CORBA_POLICYTYPESEQ___OUT_CH_ - -class TAO_Export CORBA_PolicyTypeSeq_out -{ -public: - 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 index); - -private: - CORBA_PolicyTypeSeq *&ptr_; - // assignment from T_var not allowed - void operator= (const CORBA_PolicyTypeSeq_var &); -}; - - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy; + + +#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 CORBA_PolicyManager_var : public TAO_Base_var -{ -public: - CORBA_PolicyManager_var (void); // default constructor - CORBA_PolicyManager_var (CORBA_PolicyManager_ptr p) : ptr_ (p) {} - CORBA_PolicyManager_var (const CORBA_PolicyManager_var &); // copy constructor - ~CORBA_PolicyManager_var (void); // destructor - - CORBA_PolicyManager_var &operator= (CORBA_PolicyManager_ptr); - CORBA_PolicyManager_var &operator= (const CORBA_PolicyManager_var &); - CORBA_PolicyManager_ptr operator-> (void) const; - - 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; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static CORBA_PolicyManager_ptr tao_duplicate (CORBA_PolicyManager_ptr); - static void tao_release (CORBA_PolicyManager_ptr); - static CORBA_PolicyManager_ptr tao_nil (void); - static CORBA_PolicyManager_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); - static CORBA::Object * tao_upcast (void *); - -private: - CORBA_PolicyManager_ptr ptr_; - // Unimplemented - prevents widening assignment. - CORBA_PolicyManager_var (const TAO_Base_var &rhs); - CORBA_PolicyManager_var &operator= (const TAO_Base_var &rhs); -}; + + class TAO_Export PolicyManager_var : public TAO_Base_var + { + public: + PolicyManager_var (void); // default constructor + PolicyManager_var (PolicyManager_ptr p) : ptr_ (p) {} + 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; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static PolicyManager_ptr tao_duplicate (PolicyManager_ptr); + static void tao_release (PolicyManager_ptr); + static PolicyManager_ptr tao_nil (void); + static PolicyManager_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + PolicyManager_ptr ptr_; + // Unimplemented - prevents widening assignment. + PolicyManager_var (const TAO_Base_var &rhs); + PolicyManager_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLICYMANAGER___OUT_CH_) #define _CORBA_POLICYMANAGER___OUT_CH_ - -class TAO_Export CORBA_PolicyManager_out -{ -public: - 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: - CORBA_PolicyManager_ptr &ptr_; -}; - - + + class TAO_Export PolicyManager_out + { + 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_POLICYMANAGER_CH_) #define _CORBA_POLICYMANAGER_CH_ + + class TAO_Export PolicyManager + : 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; + #endif /* ! __GNUC__ || g++ >= 2.8 */ -class TAO_Export CORBA_PolicyManager : public virtual CORBA::Object -{ -public: -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_PolicyManager_ptr _ptr_type; - typedef CORBA_PolicyManager_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static int _tao_class_id; - - // the static operations - static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj); - static CORBA_PolicyManager_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_PolicyManager_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_PolicyManager_ptr _nil (void) - { - return (CORBA_PolicyManager_ptr)0; - } - - virtual CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void set_policy_overrides ( - const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - - ACE_THROW_SPEC (( - CORBA::SystemException, - CORBA::InvalidPolicies - )) = 0; - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - -protected: - CORBA_PolicyManager (); - - virtual ~CORBA_PolicyManager (void); -private: - CORBA_PolicyManager (const CORBA_PolicyManager &); - void operator= (const CORBA_PolicyManager &); -}; - + static int _tao_class_id; + + // The static operations. + static PolicyManager_ptr _duplicate (PolicyManager_ptr obj); + + static PolicyManager_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static PolicyManager_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static PolicyManager_ptr _nil (void) + { + return (PolicyManager_ptr)0; + } + + virtual ::CORBA::PolicyList * get_policy_overrides ( + const CORBA::PolicyTypeSeq & ts + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , CORBA::InvalidPolicies + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; + protected: + PolicyManager (void); + + virtual ~PolicyManager (void); + + private: + PolicyManager (const PolicyManager &); + void operator= (const PolicyManager &); + }; + + #endif /* end #if !defined */ - - + + +#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 CORBA_PolicyCurrent_var : public TAO_Base_var -{ -public: - CORBA_PolicyCurrent_var (void); // default constructor - CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr p) : ptr_ (p) {} - CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &); // copy constructor - ~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; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static CORBA_PolicyCurrent_ptr tao_duplicate (CORBA_PolicyCurrent_ptr); - static void tao_release (CORBA_PolicyCurrent_ptr); - static CORBA_PolicyCurrent_ptr tao_nil (void); - static CORBA_PolicyCurrent_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); - static CORBA::Object * tao_upcast (void *); - -private: - CORBA_PolicyCurrent_ptr ptr_; - // Unimplemented - prevents widening assignment. - CORBA_PolicyCurrent_var (const TAO_Base_var &rhs); - CORBA_PolicyCurrent_var &operator= (const TAO_Base_var &rhs); -}; + + class TAO_Export PolicyCurrent_var : public TAO_Base_var + { + public: + PolicyCurrent_var (void); // default constructor + PolicyCurrent_var (PolicyCurrent_ptr p) : ptr_ (p) {} + 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; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static PolicyCurrent_ptr tao_duplicate (PolicyCurrent_ptr); + static void tao_release (PolicyCurrent_ptr); + static PolicyCurrent_ptr tao_nil (void); + static PolicyCurrent_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + PolicyCurrent_ptr ptr_; + // Unimplemented - prevents widening assignment. + PolicyCurrent_var (const TAO_Base_var &rhs); + 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 CORBA_PolicyCurrent_out -{ -public: - 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: - CORBA_PolicyCurrent_ptr &ptr_; -}; - - + + class TAO_Export 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); + + private: + PolicyCurrent_ptr &ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLICYCURRENT_CH_) #define _CORBA_POLICYCURRENT_CH_ + + class TAO_Export 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 */ -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 CORBA_PolicyCurrent_ptr _ptr_type; - typedef CORBA_PolicyCurrent_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static int _tao_class_id; - - // the static operations - static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj); - static CORBA_PolicyCurrent_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_PolicyCurrent_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_PolicyCurrent_ptr _nil (void) - { - return (CORBA_PolicyCurrent_ptr)0; - } - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - -protected: - CORBA_PolicyCurrent (); - - virtual ~CORBA_PolicyCurrent (void); -private: - CORBA_PolicyCurrent (const CORBA_PolicyCurrent &); - void operator= (const CORBA_PolicyCurrent &); -}; - + static int _tao_class_id; + + // The static operations. + static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj); + + static PolicyCurrent_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static PolicyCurrent_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static PolicyCurrent_ptr _nil (void) + { + return (PolicyCurrent_ptr)0; + } + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; + protected: + PolicyCurrent (void); + + virtual ~PolicyCurrent (void); + + private: + PolicyCurrent (const PolicyCurrent &); + void operator= (const PolicyCurrent &); + }; + + #endif /* end #if !defined */ - + + +} +TAO_NAMESPACE_CLOSE // module CORBA // Proxy Broker Factory function pointer declarations. extern TAO_Export -CORBA_TAO_Policy_Proxy_Broker * -(*CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer) ( +CORBA::_TAO_Policy_Proxy_Broker * +(*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ); @@ -1126,16 +904,6 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidP // 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 &); #ifndef __ACE_INLINE__ @@ -1163,43 +931,11 @@ TAO_Export CORBA::Boolean operator>> ( 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_InputCDR &, CORBA::SetOverrideType &); - #endif /* __ACE_INLINE__ */ #if defined (__ACE_INLINE__) -#include "tao/PolicyC.i" +#include "PolicyC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i index 1b2b0c267c7..d08fdf8d44f 100644 --- a/TAO/tao/PolicyC.i +++ b/TAO/tao/PolicyC.i @@ -2,7 +2,6 @@ // // $Id$ - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: // Center for Distributed Object Computing @@ -34,969 +33,189 @@ #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_) #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_ - // = Static operations. - ACE_INLINE CORBA::UShort * - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - CORBA::UShort *retval = 0; - ACE_NEW_RETURN (retval, CORBA::UShort[size], 0); - return retval; - } - - ACE_INLINE void CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Default constructor. - { - } - - ACE_INLINE - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (maximum)) - { - } - - ACE_INLINE - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum, - CORBA::ULong length, - CORBA::UShort *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } - - ACE_INLINE - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - CORBA::UShort *tmp1 = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->maximum_); - CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } - - ACE_INLINE CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort & - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs) - // Assignment operator. - { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - CORBA::UShort *tmp = ACE_reinterpret_cast (CORBA::UShort *, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::UShort *tmp1 = ACE_reinterpret_cast (CORBA::UShort *, this->buffer_); - CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - return *this; - } - - // = Accessors. - ACE_INLINE CORBA::UShort & - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) - // operator [] - { - ACE_ASSERT (i < this->maximum_); - CORBA::UShort* tmp = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_); - return tmp[i]; - } - - ACE_INLINE const CORBA::UShort & - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const - // operator [] - { - ACE_ASSERT (i < this->maximum_); - CORBA::UShort * const tmp = ACE_reinterpret_cast (CORBA::UShort* ACE_CAST_CONST, this->buffer_); - return tmp[i]; - } - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - ACE_INLINE CORBA::UShort * - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan) - { - CORBA::UShort *result = 0; - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (CORBA::UShort*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - return result; - } - - ACE_INLINE const CORBA::UShort * - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const - { - return ACE_reinterpret_cast(const CORBA::UShort * ACE_CAST_CONST, this->buffer_); - } - - ACE_INLINE void - CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (CORBA::ULong max, - CORBA::ULong length, - CORBA::UShort *data, - CORBA::Boolean release) - { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - CORBA::UShort *tmp = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_); - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp); - } - this->buffer_ = data; - this->release_ = release; - } - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICY___CI_) -#define _CORBA_POLICY___CI_ - -ACE_INLINE -CORBA_Policy::CORBA_Policy ( - TAO_Stub *objref, - CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant - ) - : CORBA_Object (objref, _tao_collocated, servant) -{ - this->CORBA_Policy_setup_collocation (_tao_collocated); -} - - -#endif /* end #if !defined */ - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_) -#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_ - - ACE_INLINE CORBA::Policy ** - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong nelems) - { - CORBA::Policy **buf = 0; - - ACE_NEW_RETURN (buf, CORBA::Policy*[nelems], 0); - - for (CORBA::ULong i = 0; i < nelems; i++) - { - buf[i] = CORBA::Policy::_nil (); - } - - return buf; - } - - ACE_INLINE void - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA::Policy **buffer) - { - if (buffer == 0) - return; - delete[] buffer; - } - - ACE_INLINE - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void) - { - } - - ACE_INLINE - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (maximum)) - { - } - - ACE_INLINE - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum, - CORBA::ULong length, - CORBA::Policy* *value, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, value, release) - { - } - - ACE_INLINE - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList(const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs) - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - CORBA::Policy **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_); - CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - tmp1[i] = CORBA::Policy::_duplicate (tmp2[i]); - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } - - ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_PolicyList & - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs) - { - if (this == &rhs) - return *this; - - if (this->release_) - { - 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 (); - } - if (this->maximum_ < rhs.maximum_) - { - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::Policy **tmp1 = ACE_reinterpret_cast (CORBA::Policy **, this->buffer_); - CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - tmp1[i] = CORBA::Policy::_duplicate (tmp2[i]); - } - - return *this; - } - - ACE_INLINE TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator[] (CORBA::ULong index) const - // read-write accessor - { - ACE_ASSERT (index < this->maximum_); - CORBA::Policy ** const tmp = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_); - return TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> (tmp + index, this->release_); - } - - ACE_INLINE CORBA::Policy* * - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (CORBA::Boolean orphan) - { - CORBA::Policy **result = 0; - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(CORBA::Policy**,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - return result; - } - - ACE_INLINE const CORBA::Policy* * - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (void) const - { - return ACE_reinterpret_cast(const CORBA::Policy ** ACE_CAST_CONST, this->buffer_); - } - - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYLIST_CI_) -#define _CORBA_POLICYLIST_CI_ - -// ************************************************************* -// Inline operations for class CORBA_PolicyList_var -// ************************************************************* - -ACE_INLINE -CORBA_PolicyList_var::CORBA_PolicyList_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -CORBA_PolicyList_var::CORBA_PolicyList_var (CORBA_PolicyList *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA_PolicyList_var::CORBA_PolicyList_var (const ::CORBA_PolicyList_var &p) // copy constructor +// = Static operations. +ACE_INLINE CORBA::UShort * +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. { - if (p.ptr_) - ACE_NEW (this->ptr_, ::CORBA_PolicyList (*p.ptr_)); - else - this->ptr_ = 0; + CORBA::UShort *retval = 0; + ACE_NEW_RETURN (retval, CORBA::UShort[size], 0); + return retval; } -ACE_INLINE -CORBA_PolicyList_var::~CORBA_PolicyList_var (void) // destructor +ACE_INLINE void CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer) +// Free the sequence. { - delete this->ptr_; -} - -ACE_INLINE CORBA_PolicyList_var & -CORBA_PolicyList_var::operator= (CORBA_PolicyList *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE ::CORBA_PolicyList_var & -CORBA_PolicyList_var::operator= (const ::CORBA_PolicyList_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - CORBA_PolicyList *deep_copy = - new CORBA_PolicyList (*p.ptr_); - - if (deep_copy != 0) - { - CORBA_PolicyList *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::CORBA_PolicyList * -CORBA_PolicyList_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA_PolicyList * -CORBA_PolicyList_var::operator-> (void) -{ - return this->ptr_; + delete [] buffer; } ACE_INLINE -CORBA_PolicyList_var::operator const ::CORBA_PolicyList &() const // cast +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Default constructor. { - return *this->ptr_; } ACE_INLINE -CORBA_PolicyList_var::operator ::CORBA_PolicyList &() // cast +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (maximum)) { - return *this->ptr_; } ACE_INLINE -CORBA_PolicyList_var::operator ::CORBA_PolicyList &() const // cast -{ - return *this->ptr_; -} - -// variable-size types only -ACE_INLINE -CORBA_PolicyList_var::operator ::CORBA_PolicyList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var> -CORBA_PolicyList_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE const ::CORBA_PolicyList & -CORBA_PolicyList_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::CORBA_PolicyList & -CORBA_PolicyList_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for variable size -ACE_INLINE ::CORBA_PolicyList *& -CORBA_PolicyList_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::CORBA_PolicyList * -CORBA_PolicyList_var::_retn (void) -{ - ::CORBA_PolicyList *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::CORBA_PolicyList * -CORBA_PolicyList_var::ptr (void) const -{ - return this->ptr_; -} - -// ************************************************************* -// Inline operations for class CORBA_PolicyList_out -// ************************************************************* - -ACE_INLINE -CORBA_PolicyList_out::CORBA_PolicyList_out (CORBA_PolicyList *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA_PolicyList_out::CORBA_PolicyList_out (CORBA_PolicyList_var &p) // constructor from _var - : ptr_ (p.out ()) +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum, + CORBA::ULong length, + CORBA::UShort *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) { - delete this->ptr_; - this->ptr_ = 0; } ACE_INLINE -CORBA_PolicyList_out::CORBA_PolicyList_out (const ::CORBA_PolicyList_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_PolicyList_out&, p).ptr_) -{} - -ACE_INLINE ::CORBA_PolicyList_out & -CORBA_PolicyList_out::operator= (const ::CORBA_PolicyList_out &p) +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) { - this->ptr_ = ACE_const_cast (CORBA_PolicyList_out&, p).ptr_; - return *this; + if (rhs.buffer_ != 0) + { + CORBA::UShort *tmp1 = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->maximum_); + CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + this->buffer_ = tmp1; + } + else + { + this->buffer_ = 0; + } } -ACE_INLINE ::CORBA_PolicyList_out & -CORBA_PolicyList_out::operator= (CORBA_PolicyList *p) +ACE_INLINE CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort & +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs) +// Assignment operator. { - this->ptr_ = p; + if (this == &rhs) + return *this; + + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + CORBA::UShort *tmp = ACE_reinterpret_cast (CORBA::UShort *, this->buffer_); + _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_); + } + } + else + this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + CORBA::UShort *tmp1 = ACE_reinterpret_cast (CORBA::UShort *, this->buffer_); + CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + return *this; } -ACE_INLINE -CORBA_PolicyList_out::operator ::CORBA_PolicyList *&() // cast +// = Accessors. +ACE_INLINE CORBA::UShort & +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) +// operator [] { - return this->ptr_; + ACE_ASSERT (i < this->maximum_); + CORBA::UShort* tmp = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_); + return tmp[i]; } -ACE_INLINE ::CORBA_PolicyList *& -CORBA_PolicyList_out::ptr (void) // ptr +ACE_INLINE const CORBA::UShort & +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const +// operator [] { - return this->ptr_; + ACE_ASSERT (i < this->maximum_); + CORBA::UShort * const tmp = ACE_reinterpret_cast (CORBA::UShort* ACE_CAST_CONST, this->buffer_); + return tmp[i]; } -ACE_INLINE ::CORBA_PolicyList * -CORBA_PolicyList_out::operator-> (void) -{ - return this->ptr_; -} +// Implement the TAO_Base_Sequence methods (see Sequence.h) -ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var> -CORBA_PolicyList_out::operator[] (CORBA::ULong index) +ACE_INLINE CORBA::UShort * +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan) { - return this->ptr_->operator[] (index); -} - - -#endif /* end #if !defined */ - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_ - - // = Static operations. - ACE_INLINE CORBA::ULong * - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - CORBA::ULong *retval = 0; - ACE_NEW_RETURN (retval, CORBA::ULong[size], 0); - return retval; - } - - ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Default constructor. - { - } - - ACE_INLINE - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (maximum)) + CORBA::UShort *result = 0; + if (orphan == 0) { - } - - ACE_INLINE - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } - - ACE_INLINE - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) + // We retain ownership. + if (this->buffer_ == 0) { - CORBA::ULong *tmp1 = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->maximum_); - CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; + result = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } else { - this->buffer_ = 0; + result = ACE_reinterpret_cast (CORBA::UShort*, this->buffer_); } } - - ACE_INLINE _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq & - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs) - // Assignment operator. + else // if (orphan == 1) { - if (this == &rhs) - return *this; - - if (this->release_) + if (this->release_ != 0) { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - return *this; - } - - // = Accessors. - ACE_INLINE CORBA::ULong & - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) - // operator [] - { - ACE_ASSERT (i < this->maximum_); - CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_); - return tmp[i]; - } - - ACE_INLINE const CORBA::ULong & - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) const - // operator [] - { - ACE_ASSERT (i < this->maximum_); - CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_); - return tmp[i]; - } - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - ACE_INLINE CORBA::ULong * - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (CORBA::Boolean orphan) - { - CORBA::ULong *result = 0; - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (CORBA::ULong*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - return result; - } - - ACE_INLINE const CORBA::ULong * - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (void) const - { - return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_); - } - - ACE_INLINE void - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::replace (CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release) - { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - CORBA::ULong *tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_); - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp); + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; } - this->buffer_ = data; - this->release_ = release; } - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYTYPESEQ_CI_) -#define _CORBA_POLICYTYPESEQ_CI_ - -// ************************************************************* -// Inline operations for class CORBA::PolicyTypeSeq_var -// ************************************************************* - -ACE_INLINE -CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &p) // copy constructor -{ - if (p.ptr_) - ACE_NEW (this->ptr_, CORBA_PolicyTypeSeq (*p.ptr_)); - else - this->ptr_ = 0; + return result; } -// fixed-size base types only -ACE_INLINE -CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq &p) +ACE_INLINE const CORBA::UShort * +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const { - ACE_NEW (this->ptr_, ::CORBA_PolicyTypeSeq (p)); + return ACE_reinterpret_cast(const CORBA::UShort * ACE_CAST_CONST, this->buffer_); } -ACE_INLINE -CORBA_PolicyTypeSeq_var::~CORBA_PolicyTypeSeq_var (void) // destructor +ACE_INLINE void +CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (CORBA::ULong max, +CORBA::ULong length, +CORBA::UShort *data, +CORBA::Boolean release) { - delete this->ptr_; -} - -ACE_INLINE CORBA_PolicyTypeSeq_var & -CORBA_PolicyTypeSeq_var::operator= (CORBA_PolicyTypeSeq *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE ::CORBA_PolicyTypeSeq_var & -CORBA_PolicyTypeSeq_var::operator= (const ::CORBA_PolicyTypeSeq_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - CORBA_PolicyTypeSeq *deep_copy = - new CORBA_PolicyTypeSeq (*p.ptr_); - - if (deep_copy != 0) - { - CORBA_PolicyTypeSeq *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// fixed-size types only -ACE_INLINE ::CORBA_PolicyTypeSeq_var & -CORBA_PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq &p) -{ - if (this->ptr_ != &p) + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) { - delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this); + CORBA::UShort *tmp = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_); + _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp); } - return *this; -} - -ACE_INLINE const ::CORBA::PolicyTypeSeq * -CORBA_PolicyTypeSeq_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::PolicyTypeSeq * -CORBA_PolicyTypeSeq_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA_PolicyTypeSeq_var::operator const ::CORBA::PolicyTypeSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA_PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA_PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE CORBA::PolicyType & -CORBA_PolicyTypeSeq_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); + this->buffer_ = data; + this->release_ = release; } -ACE_INLINE const CORBA::PolicyType & -CORBA_PolicyTypeSeq_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const CORBA::PolicyType &, this->ptr_->operator[] (index)); -} - -ACE_INLINE const ::CORBA::PolicyTypeSeq & -CORBA_PolicyTypeSeq_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::CORBA::PolicyTypeSeq & -CORBA_PolicyTypeSeq_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for variable size -ACE_INLINE ::CORBA::PolicyTypeSeq *& -CORBA_PolicyTypeSeq_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::CORBA::PolicyTypeSeq * -CORBA_PolicyTypeSeq_var::_retn (void) -{ - ::CORBA::PolicyTypeSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::CORBA::PolicyTypeSeq * -CORBA_PolicyTypeSeq_var::ptr (void) const -{ - return this->ptr_; -} - -// ************************************************************* -// Inline operations for class CORBA_PolicyTypeSeq_out -// ************************************************************* - -ACE_INLINE -CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq_var &p) // constructor from _var - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} +#endif /* end #if !defined */ -ACE_INLINE -CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (const ::CORBA_PolicyTypeSeq_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_PolicyTypeSeq_out&, p).ptr_) -{} -ACE_INLINE ::CORBA_PolicyTypeSeq_out & -CORBA_PolicyTypeSeq_out::operator= (const ::CORBA_PolicyTypeSeq_out &p) -{ - this->ptr_ = ACE_const_cast (CORBA_PolicyTypeSeq_out&, p).ptr_; - return *this; -} +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -ACE_INLINE ::CORBA_PolicyTypeSeq_out & -CORBA_PolicyTypeSeq_out::operator= (CORBA_PolicyTypeSeq *p) -{ - this->ptr_ = p; - return *this; -} +#if !defined (_CORBA_POLICY___CI_) +#define _CORBA_POLICY___CI_ ACE_INLINE -CORBA_PolicyTypeSeq_out::operator ::CORBA::PolicyTypeSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::PolicyTypeSeq *& -CORBA_PolicyTypeSeq_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::PolicyTypeSeq * -CORBA_PolicyTypeSeq_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE CORBA::PolicyType & -CORBA_PolicyTypeSeq_out::operator[] (CORBA::ULong index) +CORBA::Policy::Policy ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated, + TAO_Abstract_ServantBase *servant + ) + : CORBA_Object (objref, _tao_collocated, servant) { - return this->ptr_->operator[] (index); + this->CORBA_Policy_setup_collocation (_tao_collocated); } @@ -1010,13 +229,6 @@ CORBA_PolicyTypeSeq_out::operator[] (CORBA::ULong index) #endif /* end #if !defined */ -#if !defined (_CORBA_CURRENT___CI_) -#define _CORBA_CURRENT___CI_ - - -#endif /* end #if !defined */ - - #if !defined (_CORBA_POLICYCURRENT___CI_) #define _CORBA_POLICYCURRENT___CI_ @@ -1104,51 +316,3 @@ TAO_Export CORBA::Boolean operator>> ( CORBA::Policy_ptr & ); - -#if !defined _TAO_CDR_OP_CORBA_PolicyList_I_ -#define _TAO_CDR_OP_CORBA_PolicyList_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const CORBA_PolicyList & - ); -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - CORBA_PolicyList & - ); - -#endif /* _TAO_CDR_OP_CORBA_PolicyList_I_ */ - - -#if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ -#define _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const CORBA::PolicyTypeSeq & - ); -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - CORBA::PolicyTypeSeq & - ); - -#endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ */ - -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval) -{ - CORBA::ULong _tao_temp = _tao_enumval; - return strm << _tao_temp; -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval) -{ - CORBA::ULong _tao_temp = 0; - CORBA::Boolean _tao_result = strm >> _tao_temp; - - if (_tao_result == 1) - { - _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp); - } - - return _tao_result; -} diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl new file mode 100644 index 00000000000..3db501a1b73 --- /dev/null +++ b/TAO/tao/Policy_Forward.pidl @@ -0,0 +1,63 @@ +/** + * @file Policy_Forward.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source to forward declare some critical + * Policy-related types. + * + * This file is used to generate the code in + * Policy_ForwardC.{h,i,cpp}. + * + * The steps to regenerate the code are as follows: + * + * 1. Run the tao_idl compiler on the patched pidl file. The + * command used for this is: + * + * tao_idl.exe + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_Export + * -Wb,export_include="tao/corbafwd.h" + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * Policy_Forward.pidl + * + * 2. Then patch the generated code. This patch (a) eliminates + * cycles in the include dependencies. + * + * Apply patches using the following commands: + * + * patch < diffs/Policy_Forward.diff + * + * Note: The diffs were generated with these commands: + * + * for i in Policy_ForwardC.{h,i,cpp}; do + * diff -wBbu orig/$i $i; + * done > diffs/Policy_Forward.diff + */ + +#ifndef TAO_CORBA_POLICY_FORWARD_PIDL +#define TAO_CORBA_POLICY_FORWARD_PIDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef unsigned long PolicyType; + + interface Policy; + + typedef sequence<Policy> PolicyList; + + typedef sequence<PolicyType> PolicyTypeSeq; + + enum SetOverrideType + { + SET_OVERRIDE, + ADD_OVERRIDE + }; +}; + +#pragma prefix "" + +#endif /* TAO_CORBA_POLICY_FORWARD_PIDL */ diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 11d047109fe..c1516eb1697 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -65,7 +65,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, - CORBA_InvalidPolicies)); + CORBA::InvalidPolicies)); /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); @@ -139,7 +139,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, - CORBA_InvalidPolicies)); + CORBA::InvalidPolicies)); /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); @@ -157,4 +157,3 @@ public: #include "ace/post.h" #endif /* TAO_POLICY_MANAGER_H */ - diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index 4ea2f520105..19dd100823d 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -34,7 +34,7 @@ TAO_Policy_Manager::set_policy_overrides ( ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, - CORBA_InvalidPolicies + CORBA::InvalidPolicies )) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -113,7 +113,7 @@ TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - CORBA_InvalidPolicies)) + CORBA::InvalidPolicies)) { TAO_Policy_Current_Impl &impl = this->implementation (); @@ -127,4 +127,3 @@ TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type) return impl.get_cached_policy (type); } - diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index fa7eaa78c5b..420fce0e597 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -15,8 +15,9 @@ #ifndef TAO_POLICY_VALIDATOR_H #define TAO_POLICY_VALIDATOR_H #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "tao/corbafwd.h" +#include "tao/Policy_ForwardC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl index 87887156221..cf90aebe81c 100644 --- a/TAO/tao/Pollable.pidl +++ b/TAO/tao/Pollable.pidl @@ -11,8 +11,7 @@ * The command used to generate code from this file is: * * tao_idl - * -Ge 1 - * -DNO_VALUE + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/corbafwd.h" * -Wb,pre_include="ace/pre.h" @@ -31,46 +30,40 @@ */ //============================================================================= +#ifndef TAO_POLLABLE_PIDL +#define TAO_POLLABLE_PIDL #pragma prefix "omg.org" +module CORBA +{ + local interface PollableSet; -// We should declare this stuff in the CORBA module, but then we -// cannot support platforms that lack namespaces. -// Instead we prefix all the names with CORBA_, then we add a number -// of typedefs in corbafwd.h so it looks like they are in the CORBA -// module. Finally we modify the generated code to have all the right -// interface repository ids. -// -// @@ module CORBA -// { + local interface Pollable { + boolean is_ready(in unsigned long timeout); + PollableSet create_pollable_set( ); + }; -local interface CORBA_PollableSet; + local interface DIIPollable : Pollable { }; -local interface CORBA_Pollable { - boolean is_ready(in unsigned long timeout); + local interface PollableSet { + exception NoPossiblePollable { }; + exception UnknownPollable { }; - CORBA_PollableSet create_pollable_set( ); -}; - -local interface CORBA_DIIPollable : CORBA_Pollable { }; - -local interface CORBA_PollableSet { + DIIPollable create_dii_pollable(); - exception NoPossiblePollable { }; - exception UnknownPollable { }; + void add_pollable(in Pollable potential ); - CORBA_DIIPollable create_dii_pollable(); + Pollable poll(in unsigned long timeout) + raises( NoPossiblePollable ); - void add_pollable(in CORBA_Pollable potential ); + void remove(in Pollable potential ) + raises( UnknownPollable ); - CORBA_Pollable poll(in unsigned long timeout) - raises( NoPossiblePollable ); - - void remove(in CORBA_Pollable potential ) - raises( UnknownPollable ); - - unsigned short number_left( ); + unsigned short number_left( ); + }; }; #pragma prefix "" + +#endif /* TAO_POLLABLE_PIDL */ diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 6c02589fc72..7030688d7a5 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -1,4 +1,4 @@ -// -*- C++ -*- $Id$ */ +// -*- C++ -*- // // $Id$ @@ -25,251 +25,308 @@ #include "tao/Stub.h" #include "tao/Invocation.h" -#include "tao/Any.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) #include "PollableC.i" #endif /* !defined INLINE */ -ACE_RCSID(tao, PollableC, "$Id$") +int CORBA::Pollable::_tao_class_id = 0; + +CORBA::Pollable_ptr +tao_CORBA_Pollable_duplicate ( + CORBA::Pollable_ptr p + ) +{ + return CORBA::Pollable::_duplicate (p); +} + +void +tao_CORBA_Pollable_release ( + CORBA::Pollable_ptr p + ) +{ + CORBA::release (p); +} -int CORBA_Pollable::_tao_class_id = 0; +CORBA::Pollable_ptr +tao_CORBA_Pollable_nil ( + void + ) +{ + return CORBA::Pollable::_nil (); +} + +CORBA::Pollable_ptr +tao_CORBA_Pollable_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_CORBA_Pollable_upcast ( + void *src + ) +{ + CORBA::Pollable **tmp = + ACE_static_cast (CORBA::Pollable **, src); + return *tmp; +} // ************************************************************* -// Operations for class CORBA_Pollable_var +// CORBA::Pollable_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* -CORBA_Pollable_var::CORBA_Pollable_var (void) // default constructor - : ptr_ (CORBA_Pollable::_nil ()) +CORBA::Pollable_var::Pollable_var (void) // default constructor + : ptr_ (Pollable::_nil ()) {} -::CORBA_Pollable_ptr -CORBA_Pollable_var::ptr (void) const +::CORBA::Pollable_ptr +CORBA::Pollable_var::ptr (void) const { return this->ptr_; } -CORBA_Pollable_var::CORBA_Pollable_var (const ::CORBA_Pollable_var &p) // copy constructor +CORBA::Pollable_var::Pollable_var (const ::CORBA::Pollable_var &p) // copy constructor : TAO_Base_var (), - ptr_ (CORBA_Pollable::_duplicate (p.ptr ())) + ptr_ (Pollable::_duplicate (p.ptr ())) {} -CORBA_Pollable_var::~CORBA_Pollable_var (void) // destructor +CORBA::Pollable_var::~Pollable_var (void) // destructor { CORBA::release (this->ptr_); } -CORBA_Pollable_var & -CORBA_Pollable_var::operator= (CORBA_Pollable_ptr p) +CORBA::Pollable_var & +CORBA::Pollable_var::operator= (Pollable_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -CORBA_Pollable_var & -CORBA_Pollable_var::operator= (const ::CORBA_Pollable_var &p) +CORBA::Pollable_var & +CORBA::Pollable_var::operator= (const ::CORBA::Pollable_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_Pollable::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::Pollable::_duplicate (p.ptr ()); } return *this; } -CORBA_Pollable_var::operator const ::CORBA_Pollable_ptr &() const // cast +CORBA::Pollable_var::operator const ::CORBA::Pollable_ptr &() const // cast { return this->ptr_; } -CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast +CORBA::Pollable_var::operator ::CORBA::Pollable_ptr &() // cast { return this->ptr_; } -::CORBA_Pollable_ptr -CORBA_Pollable_var::operator-> (void) const +::CORBA::Pollable_ptr +CORBA::Pollable_var::operator-> (void) const { return this->ptr_; } -::CORBA_Pollable_ptr -CORBA_Pollable_var::in (void) const +::CORBA::Pollable_ptr +CORBA::Pollable_var::in (void) const { return this->ptr_; } -::CORBA_Pollable_ptr & -CORBA_Pollable_var::inout (void) +::CORBA::Pollable_ptr & +CORBA::Pollable_var::inout (void) { return this->ptr_; } -::CORBA_Pollable_ptr & -CORBA_Pollable_var::out (void) +::CORBA::Pollable_ptr & +CORBA::Pollable_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_Pollable::_nil (); + this->ptr_ = ::CORBA::Pollable::_nil (); return this->ptr_; } -::CORBA_Pollable_ptr -CORBA_Pollable_var::_retn (void) +::CORBA::Pollable_ptr +CORBA::Pollable_var::_retn (void) { // yield ownership of managed obj reference - ::CORBA_Pollable_ptr val = this->ptr_; - this->ptr_ = ::CORBA_Pollable::_nil (); + ::CORBA::Pollable_ptr val = this->ptr_; + this->ptr_ = ::CORBA::Pollable::_nil (); return val; } -::CORBA_Pollable_ptr -CORBA_Pollable_var::tao_duplicate (CORBA_Pollable_ptr p) +::CORBA::Pollable_ptr +CORBA::Pollable_var::tao_duplicate (Pollable_ptr p) { - return ::CORBA_Pollable::_duplicate (p); + return ::CORBA::Pollable::_duplicate (p); } void -CORBA_Pollable_var::tao_release (CORBA_Pollable_ptr p) +CORBA::Pollable_var::tao_release (Pollable_ptr p) { CORBA::release (p); } -::CORBA_Pollable_ptr -CORBA_Pollable_var::tao_nil (void) +::CORBA::Pollable_ptr +CORBA::Pollable_var::tao_nil (void) { - return ::CORBA_Pollable::_nil (); + return ::CORBA::Pollable::_nil (); } -::CORBA_Pollable_ptr -CORBA_Pollable_var::tao_narrow ( +::CORBA::Pollable_ptr +CORBA::Pollable_var::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA_Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA_Pollable_var::tao_upcast (void *src) +CORBA::Pollable_var::tao_upcast (void *src) { - CORBA_Pollable **tmp = - ACE_static_cast (CORBA_Pollable **, src); + Pollable **tmp = + ACE_static_cast (Pollable **, src); return *tmp; } + // ************************************************************* -// Inline operations for class CORBA_Pollable_out +// CORBA::Pollable_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* -CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_ptr &p) +CORBA::Pollable_out::Pollable_out (Pollable_ptr &p) : ptr_ (p) { - this->ptr_ = ::CORBA_Pollable::_nil (); + this->ptr_ = ::CORBA::Pollable::_nil (); } -CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_var &p) // constructor from _var +CORBA::Pollable_out::Pollable_out (Pollable_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_Pollable::_nil (); + this->ptr_ = ::CORBA::Pollable::_nil (); } -CORBA_Pollable_out::CORBA_Pollable_out (const ::CORBA_Pollable_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_Pollable_out &, p).ptr_) +CORBA::Pollable_out::Pollable_out (const ::CORBA::Pollable_out &p) // copy constructor + : ptr_ (ACE_const_cast (Pollable_out &, p).ptr_) {} -::CORBA_Pollable_out & -CORBA_Pollable_out::operator= (const ::CORBA_Pollable_out &p) +::CORBA::Pollable_out & +CORBA::Pollable_out::operator= (const ::CORBA::Pollable_out &p) { - this->ptr_ = ACE_const_cast (CORBA_Pollable_out&, p).ptr_; + this->ptr_ = ACE_const_cast (Pollable_out&, p).ptr_; return *this; } -CORBA_Pollable_out & -CORBA_Pollable_out::operator= (const ::CORBA_Pollable_var &p) +CORBA::Pollable_out & +CORBA::Pollable_out::operator= (const ::CORBA::Pollable_var &p) { - this->ptr_ = ::CORBA_Pollable::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::Pollable::_duplicate (p.ptr ()); return *this; } -CORBA_Pollable_out & -CORBA_Pollable_out::operator= (CORBA_Pollable_ptr p) +CORBA::Pollable_out & +CORBA::Pollable_out::operator= (Pollable_ptr p) { this->ptr_ = p; return *this; } -CORBA_Pollable_out::operator ::CORBA_Pollable_ptr &() // cast +CORBA::Pollable_out::operator ::CORBA::Pollable_ptr &() // cast { return this->ptr_; } -::CORBA_Pollable_ptr & -CORBA_Pollable_out::ptr (void) // ptr +::CORBA::Pollable_ptr & +CORBA::Pollable_out::ptr (void) // ptr { return this->ptr_; } -::CORBA_Pollable_ptr -CORBA_Pollable_out::operator-> (void) +::CORBA::Pollable_ptr +CORBA::Pollable_out::operator-> (void) { return this->ptr_; } -// default constructor -CORBA_Pollable::CORBA_Pollable () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +CORBA::Pollable::Pollable (void) +{} -// destructor -CORBA_Pollable::~CORBA_Pollable (void) +CORBA::Pollable::~Pollable (void) {} -CORBA_Pollable_ptr CORBA_Pollable::_narrow ( +CORBA::Pollable_ptr CORBA::Pollable::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) { - return CORBA_Pollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return Pollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -CORBA_Pollable_ptr CORBA_Pollable::_unchecked_narrow ( +CORBA::Pollable_ptr +CORBA::Pollable::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) - return CORBA_Pollable::_nil (); + return Pollable::_nil (); return ACE_reinterpret_cast ( - CORBA_Pollable_ptr, + Pollable_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( ptr_arith_t, - &CORBA_Pollable::_tao_class_id + &Pollable::_tao_class_id ) ) ); } -CORBA_Pollable_ptr -CORBA_Pollable::_duplicate (CORBA_Pollable_ptr obj) +CORBA::Pollable_ptr +CORBA::Pollable::_duplicate (Pollable_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -void *CORBA_Pollable::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::Pollable::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_Pollable::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, @@ -280,258 +337,307 @@ void *CORBA_Pollable::_tao_QueryInterface (ptr_arith_t type) return retv; } -const char* CORBA_Pollable::_interface_repository_id (void) const +const char* CORBA::Pollable::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/Pollable:1.0"; } -int CORBA_DIIPollable::_tao_class_id = 0; +int CORBA::DIIPollable::_tao_class_id = 0; + +CORBA::DIIPollable_ptr +tao_CORBA_DIIPollable_duplicate ( + CORBA::DIIPollable_ptr p + ) +{ + return CORBA::DIIPollable::_duplicate (p); +} + +void +tao_CORBA_DIIPollable_release ( + CORBA::DIIPollable_ptr p + ) +{ + CORBA::release (p); +} + +CORBA::DIIPollable_ptr +tao_CORBA_DIIPollable_nil ( + void + ) +{ + return CORBA::DIIPollable::_nil (); +} + +CORBA::DIIPollable_ptr +tao_CORBA_DIIPollable_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_CORBA_DIIPollable_upcast ( + void *src + ) +{ + CORBA::DIIPollable **tmp = + ACE_static_cast (CORBA::DIIPollable **, src); + return *tmp; +} // ************************************************************* -// Operations for class CORBA_DIIPollable_var +// CORBA::DIIPollable_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* -CORBA_DIIPollable_var::CORBA_DIIPollable_var (void) // default constructor - : ptr_ (CORBA_DIIPollable::_nil ()) +CORBA::DIIPollable_var::DIIPollable_var (void) // default constructor + : ptr_ (DIIPollable::_nil ()) {} -::CORBA_DIIPollable_ptr -CORBA_DIIPollable_var::ptr (void) const +::CORBA::DIIPollable_ptr +CORBA::DIIPollable_var::ptr (void) const { return this->ptr_; } -CORBA_DIIPollable_var::CORBA_DIIPollable_var (const ::CORBA_DIIPollable_var &p) // copy constructor +CORBA::DIIPollable_var::DIIPollable_var (const ::CORBA::DIIPollable_var &p) // copy constructor : TAO_Base_var (), - ptr_ (CORBA_DIIPollable::_duplicate (p.ptr ())) + ptr_ (DIIPollable::_duplicate (p.ptr ())) {} -CORBA_DIIPollable_var::~CORBA_DIIPollable_var (void) // destructor +CORBA::DIIPollable_var::~DIIPollable_var (void) // destructor { CORBA::release (this->ptr_); } -CORBA_DIIPollable_var & -CORBA_DIIPollable_var::operator= (CORBA_DIIPollable_ptr p) +CORBA::DIIPollable_var & +CORBA::DIIPollable_var::operator= (DIIPollable_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -CORBA_DIIPollable_var & -CORBA_DIIPollable_var::operator= (const ::CORBA_DIIPollable_var &p) +CORBA::DIIPollable_var & +CORBA::DIIPollable_var::operator= (const ::CORBA::DIIPollable_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_DIIPollable::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::DIIPollable::_duplicate (p.ptr ()); } return *this; } -CORBA_DIIPollable_var::operator const ::CORBA_DIIPollable_ptr &() const // cast +CORBA::DIIPollable_var::operator const ::CORBA::DIIPollable_ptr &() const // cast { return this->ptr_; } -CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast +CORBA::DIIPollable_var::operator ::CORBA::DIIPollable_ptr &() // cast { return this->ptr_; } -::CORBA_DIIPollable_ptr -CORBA_DIIPollable_var::operator-> (void) const +::CORBA::DIIPollable_ptr +CORBA::DIIPollable_var::operator-> (void) const { return this->ptr_; } -::CORBA_DIIPollable_ptr -CORBA_DIIPollable_var::in (void) const +::CORBA::DIIPollable_ptr +CORBA::DIIPollable_var::in (void) const { return this->ptr_; } -::CORBA_DIIPollable_ptr & -CORBA_DIIPollable_var::inout (void) +::CORBA::DIIPollable_ptr & +CORBA::DIIPollable_var::inout (void) { return this->ptr_; } -::CORBA_DIIPollable_ptr & -CORBA_DIIPollable_var::out (void) +::CORBA::DIIPollable_ptr & +CORBA::DIIPollable_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_DIIPollable::_nil (); + this->ptr_ = ::CORBA::DIIPollable::_nil (); return this->ptr_; } -::CORBA_DIIPollable_ptr -CORBA_DIIPollable_var::_retn (void) +::CORBA::DIIPollable_ptr +CORBA::DIIPollable_var::_retn (void) { // yield ownership of managed obj reference - ::CORBA_DIIPollable_ptr val = this->ptr_; - this->ptr_ = ::CORBA_DIIPollable::_nil (); + ::CORBA::DIIPollable_ptr val = this->ptr_; + this->ptr_ = ::CORBA::DIIPollable::_nil (); return val; } -::CORBA_DIIPollable_ptr -CORBA_DIIPollable_var::tao_duplicate (CORBA_DIIPollable_ptr p) +::CORBA::DIIPollable_ptr +CORBA::DIIPollable_var::tao_duplicate (DIIPollable_ptr p) { - return ::CORBA_DIIPollable::_duplicate (p); + return ::CORBA::DIIPollable::_duplicate (p); } void -CORBA_DIIPollable_var::tao_release (CORBA_DIIPollable_ptr p) +CORBA::DIIPollable_var::tao_release (DIIPollable_ptr p) { CORBA::release (p); } -::CORBA_DIIPollable_ptr -CORBA_DIIPollable_var::tao_nil (void) +::CORBA::DIIPollable_ptr +CORBA::DIIPollable_var::tao_nil (void) { - return ::CORBA_DIIPollable::_nil (); + return ::CORBA::DIIPollable::_nil (); } -::CORBA_DIIPollable_ptr -CORBA_DIIPollable_var::tao_narrow ( +::CORBA::DIIPollable_ptr +CORBA::DIIPollable_var::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA_DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA_DIIPollable_var::tao_upcast (void *src) +CORBA::DIIPollable_var::tao_upcast (void *src) { - CORBA_DIIPollable **tmp = - ACE_static_cast (CORBA_DIIPollable **, src); + DIIPollable **tmp = + ACE_static_cast (DIIPollable **, src); return *tmp; } + // ************************************************************* -// Inline operations for class CORBA_DIIPollable_out +// CORBA::DIIPollable_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* -CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &p) +CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_ptr &p) : ptr_ (p) { - this->ptr_ = ::CORBA_DIIPollable::_nil (); + this->ptr_ = ::CORBA::DIIPollable::_nil (); } -CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_var &p) // constructor from _var +CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_DIIPollable::_nil (); + this->ptr_ = ::CORBA::DIIPollable::_nil (); } -CORBA_DIIPollable_out::CORBA_DIIPollable_out (const ::CORBA_DIIPollable_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_DIIPollable_out &, p).ptr_) +CORBA::DIIPollable_out::DIIPollable_out (const ::CORBA::DIIPollable_out &p) // copy constructor + : ptr_ (ACE_const_cast (DIIPollable_out &, p).ptr_) {} -::CORBA_DIIPollable_out & -CORBA_DIIPollable_out::operator= (const ::CORBA_DIIPollable_out &p) +::CORBA::DIIPollable_out & +CORBA::DIIPollable_out::operator= (const ::CORBA::DIIPollable_out &p) { - this->ptr_ = ACE_const_cast (CORBA_DIIPollable_out&, p).ptr_; + this->ptr_ = ACE_const_cast (DIIPollable_out&, p).ptr_; return *this; } -CORBA_DIIPollable_out & -CORBA_DIIPollable_out::operator= (const ::CORBA_DIIPollable_var &p) +CORBA::DIIPollable_out & +CORBA::DIIPollable_out::operator= (const ::CORBA::DIIPollable_var &p) { - this->ptr_ = ::CORBA_DIIPollable::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::DIIPollable::_duplicate (p.ptr ()); return *this; } -CORBA_DIIPollable_out & -CORBA_DIIPollable_out::operator= (CORBA_DIIPollable_ptr p) +CORBA::DIIPollable_out & +CORBA::DIIPollable_out::operator= (DIIPollable_ptr p) { this->ptr_ = p; return *this; } -CORBA_DIIPollable_out::operator ::CORBA_DIIPollable_ptr &() // cast +CORBA::DIIPollable_out::operator ::CORBA::DIIPollable_ptr &() // cast { return this->ptr_; } -::CORBA_DIIPollable_ptr & -CORBA_DIIPollable_out::ptr (void) // ptr +::CORBA::DIIPollable_ptr & +CORBA::DIIPollable_out::ptr (void) // ptr { return this->ptr_; } -::CORBA_DIIPollable_ptr -CORBA_DIIPollable_out::operator-> (void) +::CORBA::DIIPollable_ptr +CORBA::DIIPollable_out::operator-> (void) { return this->ptr_; } -// default constructor -CORBA_DIIPollable::CORBA_DIIPollable () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +CORBA::DIIPollable::DIIPollable (void) +{} -// destructor -CORBA_DIIPollable::~CORBA_DIIPollable (void) +CORBA::DIIPollable::~DIIPollable (void) {} -CORBA_DIIPollable_ptr CORBA_DIIPollable::_narrow ( +CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) { - return CORBA_DIIPollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return DIIPollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -CORBA_DIIPollable_ptr CORBA_DIIPollable::_unchecked_narrow ( +CORBA::DIIPollable_ptr +CORBA::DIIPollable::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) - return CORBA_DIIPollable::_nil (); + return DIIPollable::_nil (); return ACE_reinterpret_cast ( - CORBA_DIIPollable_ptr, + DIIPollable_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( ptr_arith_t, - &CORBA_DIIPollable::_tao_class_id + &DIIPollable::_tao_class_id ) ) ); } -CORBA_DIIPollable_ptr -CORBA_DIIPollable::_duplicate (CORBA_DIIPollable_ptr obj) +CORBA::DIIPollable_ptr +CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -void *CORBA_DIIPollable::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::DIIPollable::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_DIIPollable::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, DIIPollable)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_Pollable::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id)) retv = ACE_reinterpret_cast ( void *, ACE_static_cast ( - CORBA_Pollable_ptr, + CORBA::Pollable_ptr, this ) ); @@ -544,248 +650,297 @@ void *CORBA_DIIPollable::_tao_QueryInterface (ptr_arith_t type) return retv; } -const char* CORBA_DIIPollable::_interface_repository_id (void) const +const char* CORBA::DIIPollable::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/DIIPollable:1.0"; } -int CORBA_PollableSet::_tao_class_id = 0; +int CORBA::PollableSet::_tao_class_id = 0; + +CORBA::PollableSet_ptr +tao_CORBA_PollableSet_duplicate ( + CORBA::PollableSet_ptr p + ) +{ + return CORBA::PollableSet::_duplicate (p); +} + +void +tao_CORBA_PollableSet_release ( + CORBA::PollableSet_ptr p + ) +{ + CORBA::release (p); +} + +CORBA::PollableSet_ptr +tao_CORBA_PollableSet_nil ( + void + ) +{ + return CORBA::PollableSet::_nil (); +} + +CORBA::PollableSet_ptr +tao_CORBA_PollableSet_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_CORBA_PollableSet_upcast ( + void *src + ) +{ + CORBA::PollableSet **tmp = + ACE_static_cast (CORBA::PollableSet **, src); + return *tmp; +} // ************************************************************* -// Operations for class CORBA_PollableSet_var +// CORBA::PollableSet_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* -CORBA_PollableSet_var::CORBA_PollableSet_var (void) // default constructor - : ptr_ (CORBA_PollableSet::_nil ()) +CORBA::PollableSet_var::PollableSet_var (void) // default constructor + : ptr_ (PollableSet::_nil ()) {} -::CORBA_PollableSet_ptr -CORBA_PollableSet_var::ptr (void) const +::CORBA::PollableSet_ptr +CORBA::PollableSet_var::ptr (void) const { return this->ptr_; } -CORBA_PollableSet_var::CORBA_PollableSet_var (const ::CORBA_PollableSet_var &p) // copy constructor +CORBA::PollableSet_var::PollableSet_var (const ::CORBA::PollableSet_var &p) // copy constructor : TAO_Base_var (), - ptr_ (CORBA_PollableSet::_duplicate (p.ptr ())) + ptr_ (PollableSet::_duplicate (p.ptr ())) {} -CORBA_PollableSet_var::~CORBA_PollableSet_var (void) // destructor +CORBA::PollableSet_var::~PollableSet_var (void) // destructor { CORBA::release (this->ptr_); } -CORBA_PollableSet_var & -CORBA_PollableSet_var::operator= (CORBA_PollableSet_ptr p) +CORBA::PollableSet_var & +CORBA::PollableSet_var::operator= (PollableSet_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -CORBA_PollableSet_var & -CORBA_PollableSet_var::operator= (const ::CORBA_PollableSet_var &p) +CORBA::PollableSet_var & +CORBA::PollableSet_var::operator= (const ::CORBA::PollableSet_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PollableSet::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::PollableSet::_duplicate (p.ptr ()); } return *this; } -CORBA_PollableSet_var::operator const ::CORBA_PollableSet_ptr &() const // cast +CORBA::PollableSet_var::operator const ::CORBA::PollableSet_ptr &() const // cast { return this->ptr_; } -CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast +CORBA::PollableSet_var::operator ::CORBA::PollableSet_ptr &() // cast { return this->ptr_; } -::CORBA_PollableSet_ptr -CORBA_PollableSet_var::operator-> (void) const +::CORBA::PollableSet_ptr +CORBA::PollableSet_var::operator-> (void) const { return this->ptr_; } -::CORBA_PollableSet_ptr -CORBA_PollableSet_var::in (void) const +::CORBA::PollableSet_ptr +CORBA::PollableSet_var::in (void) const { return this->ptr_; } -::CORBA_PollableSet_ptr & -CORBA_PollableSet_var::inout (void) +::CORBA::PollableSet_ptr & +CORBA::PollableSet_var::inout (void) { return this->ptr_; } -::CORBA_PollableSet_ptr & -CORBA_PollableSet_var::out (void) +::CORBA::PollableSet_ptr & +CORBA::PollableSet_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PollableSet::_nil (); + this->ptr_ = ::CORBA::PollableSet::_nil (); return this->ptr_; } -::CORBA_PollableSet_ptr -CORBA_PollableSet_var::_retn (void) +::CORBA::PollableSet_ptr +CORBA::PollableSet_var::_retn (void) { // yield ownership of managed obj reference - ::CORBA_PollableSet_ptr val = this->ptr_; - this->ptr_ = ::CORBA_PollableSet::_nil (); + ::CORBA::PollableSet_ptr val = this->ptr_; + this->ptr_ = ::CORBA::PollableSet::_nil (); return val; } -::CORBA_PollableSet_ptr -CORBA_PollableSet_var::tao_duplicate (CORBA_PollableSet_ptr p) +::CORBA::PollableSet_ptr +CORBA::PollableSet_var::tao_duplicate (PollableSet_ptr p) { - return ::CORBA_PollableSet::_duplicate (p); + return ::CORBA::PollableSet::_duplicate (p); } void -CORBA_PollableSet_var::tao_release (CORBA_PollableSet_ptr p) +CORBA::PollableSet_var::tao_release (PollableSet_ptr p) { CORBA::release (p); } -::CORBA_PollableSet_ptr -CORBA_PollableSet_var::tao_nil (void) +::CORBA::PollableSet_ptr +CORBA::PollableSet_var::tao_nil (void) { - return ::CORBA_PollableSet::_nil (); + return ::CORBA::PollableSet::_nil (); } -::CORBA_PollableSet_ptr -CORBA_PollableSet_var::tao_narrow ( +::CORBA::PollableSet_ptr +CORBA::PollableSet_var::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA_PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); + return ::CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA_PollableSet_var::tao_upcast (void *src) +CORBA::PollableSet_var::tao_upcast (void *src) { - CORBA_PollableSet **tmp = - ACE_static_cast (CORBA_PollableSet **, src); + PollableSet **tmp = + ACE_static_cast (PollableSet **, src); return *tmp; } + // ************************************************************* -// Inline operations for class CORBA_PollableSet_out +// CORBA::PollableSet_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* -CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_ptr &p) +CORBA::PollableSet_out::PollableSet_out (PollableSet_ptr &p) : ptr_ (p) { - this->ptr_ = ::CORBA_PollableSet::_nil (); + this->ptr_ = ::CORBA::PollableSet::_nil (); } -CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_var &p) // constructor from _var +CORBA::PollableSet_out::PollableSet_out (PollableSet_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::CORBA_PollableSet::_nil (); + this->ptr_ = ::CORBA::PollableSet::_nil (); } -CORBA_PollableSet_out::CORBA_PollableSet_out (const ::CORBA_PollableSet_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_PollableSet_out &, p).ptr_) +CORBA::PollableSet_out::PollableSet_out (const ::CORBA::PollableSet_out &p) // copy constructor + : ptr_ (ACE_const_cast (PollableSet_out &, p).ptr_) {} -::CORBA_PollableSet_out & -CORBA_PollableSet_out::operator= (const ::CORBA_PollableSet_out &p) +::CORBA::PollableSet_out & +CORBA::PollableSet_out::operator= (const ::CORBA::PollableSet_out &p) { - this->ptr_ = ACE_const_cast (CORBA_PollableSet_out&, p).ptr_; + this->ptr_ = ACE_const_cast (PollableSet_out&, p).ptr_; return *this; } -CORBA_PollableSet_out & -CORBA_PollableSet_out::operator= (const ::CORBA_PollableSet_var &p) +CORBA::PollableSet_out & +CORBA::PollableSet_out::operator= (const ::CORBA::PollableSet_var &p) { - this->ptr_ = ::CORBA_PollableSet::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA::PollableSet::_duplicate (p.ptr ()); return *this; } -CORBA_PollableSet_out & -CORBA_PollableSet_out::operator= (CORBA_PollableSet_ptr p) +CORBA::PollableSet_out & +CORBA::PollableSet_out::operator= (PollableSet_ptr p) { this->ptr_ = p; return *this; } -CORBA_PollableSet_out::operator ::CORBA_PollableSet_ptr &() // cast +CORBA::PollableSet_out::operator ::CORBA::PollableSet_ptr &() // cast { return this->ptr_; } -::CORBA_PollableSet_ptr & -CORBA_PollableSet_out::ptr (void) // ptr +::CORBA::PollableSet_ptr & +CORBA::PollableSet_out::ptr (void) // ptr { return this->ptr_; } -::CORBA_PollableSet_ptr -CORBA_PollableSet_out::operator-> (void) +::CORBA::PollableSet_ptr +CORBA::PollableSet_out::operator-> (void) { return this->ptr_; } -// default constructor -CORBA_PollableSet::CORBA_PollableSet () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +CORBA::PollableSet::PollableSet (void) +{} -// destructor -CORBA_PollableSet::~CORBA_PollableSet (void) +CORBA::PollableSet::~PollableSet (void) {} -CORBA_PollableSet_ptr CORBA_PollableSet::_narrow ( +CORBA::PollableSet_ptr CORBA::PollableSet::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) { - return CORBA_PollableSet::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return PollableSet::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -CORBA_PollableSet_ptr CORBA_PollableSet::_unchecked_narrow ( +CORBA::PollableSet_ptr +CORBA::PollableSet::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) - return CORBA_PollableSet::_nil (); + return PollableSet::_nil (); return ACE_reinterpret_cast ( - CORBA_PollableSet_ptr, + PollableSet_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( ptr_arith_t, - &CORBA_PollableSet::_tao_class_id + &PollableSet::_tao_class_id ) ) ); } -CORBA_PollableSet_ptr -CORBA_PollableSet::_duplicate (CORBA_PollableSet_ptr obj) +CORBA::PollableSet_ptr +CORBA::PollableSet::_duplicate (PollableSet_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -void *CORBA_PollableSet::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::PollableSet::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &CORBA_PollableSet::_tao_class_id)) + &ACE_NESTED_CLASS (::CORBA, PollableSet)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, @@ -796,41 +951,40 @@ void *CORBA_PollableSet::_tao_QueryInterface (ptr_arith_t type) return retv; } -const char* CORBA_PollableSet::_interface_repository_id (void) const +const char* CORBA::PollableSet::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_PollableSet:1.0"; + return "IDL:omg.org/CORBA/PollableSet:1.0"; } // Default constructor. -CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (void) - : CORBA_UserException ("IDL:omg.org/CORBA_PollableSet/NoPossiblePollable:1.0") +CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void) + : CORBA_UserException ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0") { } // Destructor - all members are of self managing types. -CORBA_PollableSet::NoPossiblePollable::~NoPossiblePollable (void) +CORBA::PollableSet::NoPossiblePollable::~NoPossiblePollable (void) { } // Copy constructor. -CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA_PollableSet::NoPossiblePollable &_tao_excp) +CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp) : CORBA_UserException (_tao_excp._id ()) { } // Assignment operator. -CORBA_PollableSet::NoPossiblePollable& -CORBA_PollableSet::NoPossiblePollable::operator= (const ::CORBA_PollableSet::NoPossiblePollable &_tao_excp) +CORBA::PollableSet::NoPossiblePollable& +CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp) { this->CORBA_UserException::operator= (_tao_excp); return *this; } -// Narrow. -CORBA_PollableSet::NoPossiblePollable * -CORBA_PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *exc) +CORBA::PollableSet::NoPossiblePollable * +CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PollableSet/NoPossiblePollable:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ())) { return ACE_dynamic_cast (NoPossiblePollable *, exc); } @@ -840,12 +994,31 @@ CORBA_PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *exc) } } -void CORBA_PollableSet::NoPossiblePollable::_raise () +CORBA::Exception *CORBA::PollableSet::NoPossiblePollable::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::CORBA::PollableSet::NoPossiblePollable, 0); + return retval; +} + +CORBA::Exception * +CORBA::PollableSet::NoPossiblePollable::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA::PollableSet::NoPossiblePollable (*this), + 0 + ); + return result; +} + +void CORBA::PollableSet::NoPossiblePollable::_raise () { TAO_RAISE (*this); } -void CORBA_PollableSet::NoPossiblePollable::_tao_encode ( +void CORBA::PollableSet::NoPossiblePollable::_tao_encode ( TAO_OutputCDR & ACE_ENV_ARG_DECL ) const @@ -853,7 +1026,7 @@ void CORBA_PollableSet::NoPossiblePollable::_tao_encode ( ACE_THROW (CORBA::MARSHAL ()); } -void CORBA_PollableSet::NoPossiblePollable::_tao_decode ( +void CORBA::PollableSet::NoPossiblePollable::_tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ) @@ -861,44 +1034,35 @@ void CORBA_PollableSet::NoPossiblePollable::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method -CORBA::Exception *CORBA_PollableSet::NoPossiblePollable::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::CORBA_PollableSet::NoPossiblePollable, 0); - return retval; -} - // Default constructor. -CORBA_PollableSet::UnknownPollable::UnknownPollable (void) - : CORBA_UserException ("IDL:omg.org/CORBA_PollableSet/UnknownPollable:1.0") +CORBA::PollableSet::UnknownPollable::UnknownPollable (void) + : CORBA_UserException ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0") { } // Destructor - all members are of self managing types. -CORBA_PollableSet::UnknownPollable::~UnknownPollable (void) +CORBA::PollableSet::UnknownPollable::~UnknownPollable (void) { } // Copy constructor. -CORBA_PollableSet::UnknownPollable::UnknownPollable (const ::CORBA_PollableSet::UnknownPollable &_tao_excp) +CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet::UnknownPollable &_tao_excp) : CORBA_UserException (_tao_excp._id ()) { } // Assignment operator. -CORBA_PollableSet::UnknownPollable& -CORBA_PollableSet::UnknownPollable::operator= (const ::CORBA_PollableSet::UnknownPollable &_tao_excp) +CORBA::PollableSet::UnknownPollable& +CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp) { this->CORBA_UserException::operator= (_tao_excp); return *this; } -// Narrow. -CORBA_PollableSet::UnknownPollable * -CORBA_PollableSet::UnknownPollable::_downcast (CORBA::Exception *exc) +CORBA::PollableSet::UnknownPollable * +CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PollableSet/UnknownPollable:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ())) { return ACE_dynamic_cast (UnknownPollable *, exc); } @@ -908,54 +1072,65 @@ CORBA_PollableSet::UnknownPollable::_downcast (CORBA::Exception *exc) } } -void CORBA_PollableSet::UnknownPollable::_raise () +CORBA::Exception *CORBA::PollableSet::UnknownPollable::_alloc (void) { - TAO_RAISE(*this); + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::CORBA::PollableSet::UnknownPollable, 0); + return retval; } -void CORBA_PollableSet::UnknownPollable::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL) const +CORBA::Exception * +CORBA::PollableSet::UnknownPollable::_tao_duplicate (void) const { - ACE_THROW (CORBA::MARSHAL ()); + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA::PollableSet::UnknownPollable (*this), + 0 + ); + return result; } +void CORBA::PollableSet::UnknownPollable::_raise () +{ + TAO_RAISE (*this); +} -void CORBA_PollableSet::UnknownPollable::_tao_decode ( - TAO_InputCDR & +void CORBA::PollableSet::UnknownPollable::_tao_encode ( + TAO_OutputCDR & ACE_ENV_ARG_DECL - ) + ) const { ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *CORBA_PollableSet::UnknownPollable::_alloc (void) +void CORBA::PollableSet::UnknownPollable::_tao_decode ( + TAO_InputCDR & + ACE_ENV_ARG_DECL + ) { - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::CORBA_PollableSet::UnknownPollable, 0); - return retval; + ACE_THROW (CORBA::MARSHAL ()); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_Pollable,CORBA_Pollable_var>; + template class TAO_Object_Manager<CORBA::Pollable,CORBA::Pollable_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA_Pollable,CORBA_Pollable_var> + # pragma instantiate TAO_Object_Manager<CORBA::Pollable,CORBA::Pollable_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_DIIPollable,CORBA_DIIPollable_var>; + template class TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA_DIIPollable,CORBA_DIIPollable_var> + # pragma instantiate TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_PollableSet,CORBA_PollableSet_var>; + template class TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA_PollableSet,CORBA_PollableSet_var> + # pragma instantiate TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index 13dbbeefbae..5752e5ace91 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -19,22 +19,20 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_TMP_POLLABLEC_H_ -#define _TAO_IDL_TMP_POLLABLEC_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_ORIG_POLLABLEC_H_ +#define _TAO_IDL_ORIG_POLLABLEC_H_ +#include "ace/pre.h" #include "tao/corbafwd.h" #if (TAO_HAS_AMI_POLLER == 1) - -#include "tao/Object.h" -#include "tao/Exception.h" -#include "tao/CDR.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "TAO_Export.h" +#include "Exception.h" +#include "Object.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -59,514 +57,609 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -class CORBA_PollableSet; - +TAO_NAMESPACE CORBA +{ + class PollableSet; + #if !defined (_CORBA_POLLABLESET___PTR_CH_) #define _CORBA_POLLABLESET___PTR_CH_ - -typedef CORBA_PollableSet *CORBA_PollableSet_ptr; - + + typedef PollableSet *PollableSet_ptr; + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLLABLESET___VAR_CH_) #define _CORBA_POLLABLESET___VAR_CH_ - -class TAO_Export CORBA_PollableSet_var : public TAO_Base_var -{ -public: - CORBA_PollableSet_var (void); // default constructor - CORBA_PollableSet_var (CORBA_PollableSet_ptr p) : ptr_ (p) {} - CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor - ~CORBA_PollableSet_var (void); // destructor - - CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr); - CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &); - CORBA_PollableSet_ptr operator-> (void) const; - - operator const CORBA_PollableSet_ptr &() const; - operator CORBA_PollableSet_ptr &(); - // in, inout, out, _retn - CORBA_PollableSet_ptr in (void) const; - CORBA_PollableSet_ptr &inout (void); - CORBA_PollableSet_ptr &out (void); - CORBA_PollableSet_ptr _retn (void); - CORBA_PollableSet_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static CORBA_PollableSet_ptr tao_duplicate (CORBA_PollableSet_ptr); - static void tao_release (CORBA_PollableSet_ptr); - static CORBA_PollableSet_ptr tao_nil (void); - static CORBA_PollableSet_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); - static CORBA::Object * tao_upcast (void *); - -private: - CORBA_PollableSet_ptr ptr_; - // Unimplemented - prevents widening assignment. - CORBA_PollableSet_var (const TAO_Base_var &rhs); - CORBA_PollableSet_var &operator= (const TAO_Base_var &rhs); -}; + + class TAO_Export PollableSet_var : public TAO_Base_var + { + public: + PollableSet_var (void); // default constructor + PollableSet_var (PollableSet_ptr p) : ptr_ (p) {} + PollableSet_var (const PollableSet_var &); // copy constructor + ~PollableSet_var (void); // destructor + + PollableSet_var &operator= (PollableSet_ptr); + PollableSet_var &operator= (const PollableSet_var &); + PollableSet_ptr operator-> (void) const; + + operator const PollableSet_ptr &() const; + operator PollableSet_ptr &(); + // in, inout, out, _retn + PollableSet_ptr in (void) const; + PollableSet_ptr &inout (void); + PollableSet_ptr &out (void); + PollableSet_ptr _retn (void); + PollableSet_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static PollableSet_ptr tao_duplicate (PollableSet_ptr); + static void tao_release (PollableSet_ptr); + static PollableSet_ptr tao_nil (void); + static PollableSet_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + PollableSet_ptr ptr_; + // Unimplemented - prevents widening assignment. + PollableSet_var (const TAO_Base_var &rhs); + PollableSet_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLLABLESET___OUT_CH_) #define _CORBA_POLLABLESET___OUT_CH_ - -class TAO_Export CORBA_PollableSet_out -{ -public: - CORBA_PollableSet_out (CORBA_PollableSet_ptr &); - CORBA_PollableSet_out (CORBA_PollableSet_var &); - CORBA_PollableSet_out (const CORBA_PollableSet_out &); - CORBA_PollableSet_out &operator= (const CORBA_PollableSet_out &); - CORBA_PollableSet_out &operator= (const CORBA_PollableSet_var &); - CORBA_PollableSet_out &operator= (CORBA_PollableSet_ptr); - operator CORBA_PollableSet_ptr &(); - CORBA_PollableSet_ptr &ptr (void); - CORBA_PollableSet_ptr operator-> (void); - -private: - CORBA_PollableSet_ptr &ptr_; -}; - - + + class TAO_Export PollableSet_out + { + public: + PollableSet_out (PollableSet_ptr &); + PollableSet_out (PollableSet_var &); + PollableSet_out (const PollableSet_out &); + PollableSet_out &operator= (const PollableSet_out &); + PollableSet_out &operator= (const PollableSet_var &); + PollableSet_out &operator= (PollableSet_ptr); + operator PollableSet_ptr &(); + PollableSet_ptr &ptr (void); + PollableSet_ptr operator-> (void); + + private: + PollableSet_ptr &ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLLABLE___PTR_CH_) #define _CORBA_POLLABLE___PTR_CH_ - -class CORBA_Pollable; -typedef CORBA_Pollable *CORBA_Pollable_ptr; - + + class Pollable; + typedef Pollable *Pollable_ptr; + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLLABLE___VAR_CH_) #define _CORBA_POLLABLE___VAR_CH_ - -class TAO_Export CORBA_Pollable_var : public TAO_Base_var -{ -public: - CORBA_Pollable_var (void); // default constructor - CORBA_Pollable_var (CORBA_Pollable_ptr p) : ptr_ (p) {} - CORBA_Pollable_var (const CORBA_Pollable_var &); // copy constructor - ~CORBA_Pollable_var (void); // destructor - - CORBA_Pollable_var &operator= (CORBA_Pollable_ptr); - CORBA_Pollable_var &operator= (const CORBA_Pollable_var &); - CORBA_Pollable_ptr operator-> (void) const; - - operator const CORBA_Pollable_ptr &() const; - operator CORBA_Pollable_ptr &(); - // in, inout, out, _retn - CORBA_Pollable_ptr in (void) const; - CORBA_Pollable_ptr &inout (void); - CORBA_Pollable_ptr &out (void); - CORBA_Pollable_ptr _retn (void); - CORBA_Pollable_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static CORBA_Pollable_ptr tao_duplicate (CORBA_Pollable_ptr); - static void tao_release (CORBA_Pollable_ptr); - static CORBA_Pollable_ptr tao_nil (void); - static CORBA_Pollable_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); - static CORBA::Object * tao_upcast (void *); - -private: - CORBA_Pollable_ptr ptr_; - // Unimplemented - prevents widening assignment. - CORBA_Pollable_var (const TAO_Base_var &rhs); - CORBA_Pollable_var &operator= (const TAO_Base_var &rhs); -}; + + class TAO_Export Pollable_var : public TAO_Base_var + { + public: + Pollable_var (void); // default constructor + Pollable_var (Pollable_ptr p) : ptr_ (p) {} + Pollable_var (const Pollable_var &); // copy constructor + ~Pollable_var (void); // destructor + + Pollable_var &operator= (Pollable_ptr); + Pollable_var &operator= (const Pollable_var &); + Pollable_ptr operator-> (void) const; + + operator const Pollable_ptr &() const; + operator Pollable_ptr &(); + // in, inout, out, _retn + Pollable_ptr in (void) const; + Pollable_ptr &inout (void); + Pollable_ptr &out (void); + Pollable_ptr _retn (void); + Pollable_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static Pollable_ptr tao_duplicate (Pollable_ptr); + static void tao_release (Pollable_ptr); + static Pollable_ptr tao_nil (void); + static Pollable_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + Pollable_ptr ptr_; + // Unimplemented - prevents widening assignment. + Pollable_var (const TAO_Base_var &rhs); + Pollable_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLLABLE___OUT_CH_) #define _CORBA_POLLABLE___OUT_CH_ - -class TAO_Export CORBA_Pollable_out -{ -public: - CORBA_Pollable_out (CORBA_Pollable_ptr &); - CORBA_Pollable_out (CORBA_Pollable_var &); - CORBA_Pollable_out (const CORBA_Pollable_out &); - CORBA_Pollable_out &operator= (const CORBA_Pollable_out &); - CORBA_Pollable_out &operator= (const CORBA_Pollable_var &); - CORBA_Pollable_out &operator= (CORBA_Pollable_ptr); - operator CORBA_Pollable_ptr &(); - CORBA_Pollable_ptr &ptr (void); - CORBA_Pollable_ptr operator-> (void); - -private: - CORBA_Pollable_ptr &ptr_; -}; - - + + class TAO_Export Pollable_out + { + public: + Pollable_out (Pollable_ptr &); + Pollable_out (Pollable_var &); + Pollable_out (const Pollable_out &); + Pollable_out &operator= (const Pollable_out &); + Pollable_out &operator= (const Pollable_var &); + Pollable_out &operator= (Pollable_ptr); + operator Pollable_ptr &(); + Pollable_ptr &ptr (void); + Pollable_ptr operator-> (void); + + private: + Pollable_ptr &ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLLABLE_CH_) #define _CORBA_POLLABLE_CH_ - -class TAO_Export CORBA_Pollable : public virtual CORBA_Object -{ -public: -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_Pollable_ptr _ptr_type; - typedef CORBA_Pollable_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static int _tao_class_id; - - // the static operations - static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj); - static CORBA_Pollable_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_Pollable_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_Pollable_ptr _nil (void) - { - return (CORBA_Pollable_ptr)0; - } - - virtual CORBA::Boolean is_ready ( - CORBA::ULong timeout - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual CORBA_PollableSet_ptr create_pollable_set ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - -protected: - CORBA_Pollable (void); - - virtual ~CORBA_Pollable (void); -private: - CORBA_Pollable (const CORBA_Pollable &); - void operator= (const CORBA_Pollable &); -}; - - + + class TAO_Export Pollable + : public virtual CORBA_Object + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef Pollable_ptr _ptr_type; + typedef Pollable_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + static int _tao_class_id; + + // The static operations. + static Pollable_ptr _duplicate (Pollable_ptr obj); + + static Pollable_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static Pollable_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static Pollable_ptr _nil (void) + { + return (Pollable_ptr)0; + } + + virtual CORBA::Boolean is_ready ( + CORBA::ULong timeout + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual ::CORBA::PollableSet_ptr create_pollable_set ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; + + protected: + Pollable (void); + + virtual ~Pollable (void); + + private: + Pollable (const Pollable &); + void operator= (const Pollable &); + }; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DIIPOLLABLE___PTR_CH_) #define _CORBA_DIIPOLLABLE___PTR_CH_ - -class CORBA_DIIPollable; -typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr; - + + class DIIPollable; + typedef DIIPollable *DIIPollable_ptr; + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DIIPOLLABLE___VAR_CH_) #define _CORBA_DIIPOLLABLE___VAR_CH_ - -class TAO_Export CORBA_DIIPollable_var : public TAO_Base_var -{ -public: - CORBA_DIIPollable_var (void); // default constructor - CORBA_DIIPollable_var (CORBA_DIIPollable_ptr p) : ptr_ (p) {} - CORBA_DIIPollable_var (const CORBA_DIIPollable_var &); // copy constructor - ~CORBA_DIIPollable_var (void); // destructor - - CORBA_DIIPollable_var &operator= (CORBA_DIIPollable_ptr); - CORBA_DIIPollable_var &operator= (const CORBA_DIIPollable_var &); - CORBA_DIIPollable_ptr operator-> (void) const; - - operator const CORBA_DIIPollable_ptr &() const; - operator CORBA_DIIPollable_ptr &(); - // in, inout, out, _retn - CORBA_DIIPollable_ptr in (void) const; - CORBA_DIIPollable_ptr &inout (void); - CORBA_DIIPollable_ptr &out (void); - CORBA_DIIPollable_ptr _retn (void); - CORBA_DIIPollable_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static CORBA_DIIPollable_ptr tao_duplicate (CORBA_DIIPollable_ptr); - static void tao_release (CORBA_DIIPollable_ptr); - static CORBA_DIIPollable_ptr tao_nil (void); - static CORBA_DIIPollable_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); - static CORBA::Object * tao_upcast (void *); - -private: - CORBA_DIIPollable_ptr ptr_; - // Unimplemented - prevents widening assignment. - CORBA_DIIPollable_var (const TAO_Base_var &rhs); - CORBA_DIIPollable_var &operator= (const TAO_Base_var &rhs); -}; + + class TAO_Export DIIPollable_var : public TAO_Base_var + { + public: + DIIPollable_var (void); // default constructor + DIIPollable_var (DIIPollable_ptr p) : ptr_ (p) {} + DIIPollable_var (const DIIPollable_var &); // copy constructor + ~DIIPollable_var (void); // destructor + + DIIPollable_var &operator= (DIIPollable_ptr); + DIIPollable_var &operator= (const DIIPollable_var &); + DIIPollable_ptr operator-> (void) const; + + operator const DIIPollable_ptr &() const; + operator DIIPollable_ptr &(); + // in, inout, out, _retn + DIIPollable_ptr in (void) const; + DIIPollable_ptr &inout (void); + DIIPollable_ptr &out (void); + DIIPollable_ptr _retn (void); + DIIPollable_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static DIIPollable_ptr tao_duplicate (DIIPollable_ptr); + static void tao_release (DIIPollable_ptr); + static DIIPollable_ptr tao_nil (void); + static DIIPollable_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + DIIPollable_ptr ptr_; + // Unimplemented - prevents widening assignment. + DIIPollable_var (const TAO_Base_var &rhs); + DIIPollable_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DIIPOLLABLE___OUT_CH_) #define _CORBA_DIIPOLLABLE___OUT_CH_ - -class TAO_Export CORBA_DIIPollable_out -{ -public: - CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &); - CORBA_DIIPollable_out (CORBA_DIIPollable_var &); - CORBA_DIIPollable_out (const CORBA_DIIPollable_out &); - CORBA_DIIPollable_out &operator= (const CORBA_DIIPollable_out &); - CORBA_DIIPollable_out &operator= (const CORBA_DIIPollable_var &); - CORBA_DIIPollable_out &operator= (CORBA_DIIPollable_ptr); - operator CORBA_DIIPollable_ptr &(); - CORBA_DIIPollable_ptr &ptr (void); - CORBA_DIIPollable_ptr operator-> (void); - -private: - CORBA_DIIPollable_ptr &ptr_; -}; - - + + class TAO_Export DIIPollable_out + { + public: + DIIPollable_out (DIIPollable_ptr &); + DIIPollable_out (DIIPollable_var &); + DIIPollable_out (const DIIPollable_out &); + DIIPollable_out &operator= (const DIIPollable_out &); + DIIPollable_out &operator= (const DIIPollable_var &); + DIIPollable_out &operator= (DIIPollable_ptr); + operator DIIPollable_ptr &(); + DIIPollable_ptr &ptr (void); + DIIPollable_ptr operator-> (void); + + private: + DIIPollable_ptr &ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_DIIPOLLABLE_CH_) #define _CORBA_DIIPOLLABLE_CH_ - -class TAO_Export CORBA_DIIPollable: public virtual CORBA_Pollable -{ -public: -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_DIIPollable_ptr _ptr_type; - typedef CORBA_DIIPollable_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static int _tao_class_id; - - // the static operations - static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj); - static CORBA_DIIPollable_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_DIIPollable_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_DIIPollable_ptr _nil (void) - { - return (CORBA_DIIPollable_ptr)0; - } - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - -protected: - CORBA_DIIPollable (void); - - virtual ~CORBA_DIIPollable (void); -private: - CORBA_DIIPollable (const CORBA_DIIPollable &); - void operator= (const CORBA_DIIPollable &); -}; - - + + class TAO_Export DIIPollable + : public virtual CORBA::Pollable + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef DIIPollable_ptr _ptr_type; + typedef DIIPollable_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + static int _tao_class_id; + + // The static operations. + static DIIPollable_ptr _duplicate (DIIPollable_ptr obj); + + static DIIPollable_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static DIIPollable_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static DIIPollable_ptr _nil (void) + { + return (DIIPollable_ptr)0; + } + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; + + protected: + DIIPollable (void); + + virtual ~DIIPollable (void); + + private: + DIIPollable (const DIIPollable &); + void operator= (const DIIPollable &); + }; + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_POLLABLESET___PTR_CH_) #define _CORBA_POLLABLESET___PTR_CH_ - -class CORBA_PollableSet; -typedef CORBA_PollableSet *CORBA_PollableSet_ptr; - + + class PollableSet; + typedef PollableSet *PollableSet_ptr; + #endif /* end #if !defined */ - - -#if !defined (_CORBA_POLLABLESET_CH_) -#define _CORBA_POLLABLESET_CH_ - -class TAO_Export CORBA_PollableSet : public virtual CORBA_Object -{ -public: -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef CORBA_PollableSet_ptr _ptr_type; - typedef CORBA_PollableSet_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static int _tao_class_id; - - // the static operations - static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj); - static CORBA_PollableSet_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_PollableSet_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - static CORBA_PollableSet_ptr _nil (void) - { - return (CORBA_PollableSet_ptr)0; - } - - -#if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_) -#define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_ - - class TAO_Export NoPossiblePollable : public CORBA::UserException + + +#if !defined (_CORBA_POLLABLESET___VAR_CH_) +#define _CORBA_POLLABLESET___VAR_CH_ + + class TAO_Export PollableSet_var : public TAO_Base_var { public: - - NoPossiblePollable (void); - // Default constructor. - - NoPossiblePollable (const NoPossiblePollable &); - // Copy constructor. - - ~NoPossiblePollable (void); - // Destructor. - - NoPossiblePollable &operator= (const NoPossiblePollable &); - - virtual void _raise (void); - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & + PollableSet_var (void); // default constructor + PollableSet_var (PollableSet_ptr p) : ptr_ (p) {} + PollableSet_var (const PollableSet_var &); // copy constructor + ~PollableSet_var (void); // destructor + + PollableSet_var &operator= (PollableSet_ptr); + PollableSet_var &operator= (const PollableSet_var &); + PollableSet_ptr operator-> (void) const; + + operator const PollableSet_ptr &() const; + operator PollableSet_ptr &(); + // in, inout, out, _retn + PollableSet_ptr in (void) const; + PollableSet_ptr &inout (void); + PollableSet_ptr &out (void); + PollableSet_ptr _retn (void); + PollableSet_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static PollableSet_ptr tao_duplicate (PollableSet_ptr); + static void tao_release (PollableSet_ptr); + static PollableSet_ptr tao_nil (void); + static PollableSet_ptr tao_narrow ( + CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED ); - - static NoPossiblePollable *_downcast (CORBA::Exception *); - - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception CORBA_PollableSet::NoPossiblePollable. + static CORBA::Object * tao_upcast (void *); + + private: + PollableSet_ptr ptr_; + // Unimplemented - prevents widening assignment. + PollableSet_var (const TAO_Base_var &rhs); + PollableSet_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - -#if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_) -#define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_ - - class TAO_Export UnknownPollable : public CORBA::UserException + + +#if !defined (_CORBA_POLLABLESET___OUT_CH_) +#define _CORBA_POLLABLESET___OUT_CH_ + + class TAO_Export PollableSet_out { public: - - UnknownPollable (void); - // Default constructor. - - UnknownPollable (const UnknownPollable &); - // Copy constructor. - - ~UnknownPollable (void); - // Destructor. - - UnknownPollable &operator= (const UnknownPollable &); - - virtual void _raise (void); - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ); - - static UnknownPollable *_downcast (CORBA::Exception *); - - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception CORBA_PollableSet::UnknownPollable. - - + PollableSet_out (PollableSet_ptr &); + PollableSet_out (PollableSet_var &); + PollableSet_out (const PollableSet_out &); + PollableSet_out &operator= (const PollableSet_out &); + PollableSet_out &operator= (const PollableSet_var &); + PollableSet_out &operator= (PollableSet_ptr); + operator PollableSet_ptr &(); + PollableSet_ptr &ptr (void); + PollableSet_ptr operator-> (void); + + private: + PollableSet_ptr &ptr_; + }; + + #endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET_CH_) +#define _CORBA_POLLABLESET_CH_ + + class TAO_Export PollableSet + : public virtual CORBA_Object + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef PollableSet_ptr _ptr_type; + typedef PollableSet_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + static int _tao_class_id; + + // The static operations. + static PollableSet_ptr _duplicate (PollableSet_ptr obj); + + static PollableSet_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static PollableSet_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static PollableSet_ptr _nil (void) + { + return (PollableSet_ptr)0; + } + + +#if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_) +#define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_ + + class TAO_Export NoPossiblePollable : public CORBA::UserException + { + public: + + NoPossiblePollable (void); + NoPossiblePollable (const NoPossiblePollable &); + ~NoPossiblePollable (void); -virtual CORBA_DIIPollable_ptr create_dii_pollable ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - -virtual void add_pollable ( - CORBA_Pollable_ptr potential - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + NoPossiblePollable &operator= (const NoPossiblePollable &); - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + static NoPossiblePollable *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); -virtual CORBA_Pollable_ptr poll ( - CORBA::ULong timeout - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Exception *_tao_duplicate (void) const; - ACE_THROW_SPEC (( - CORBA::SystemException, - CORBA_PollableSet::NoPossiblePollable - )) = 0; + virtual void _raise (void); -virtual void remove ( - CORBA_Pollable_ptr potential - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void _tao_encode ( + TAO_OutputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ) const; + + virtual void _tao_decode ( + TAO_InputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ); + + + }; - ACE_THROW_SPEC (( - CORBA::SystemException, - CORBA_PollableSet::UnknownPollable - )) = 0; -virtual CORBA::UShort number_left ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_) +#define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_ + + class TAO_Export UnknownPollable : public CORBA::UserException + { + public: + + UnknownPollable (void); + UnknownPollable (const UnknownPollable &); + ~UnknownPollable (void); - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + UnknownPollable &operator= (const UnknownPollable &); -virtual void *_tao_QueryInterface (ptr_arith_t type); + static UnknownPollable *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); -virtual const char* _interface_repository_id (void) const; + virtual CORBA::Exception *_tao_duplicate (void) const; -protected: - CORBA_PollableSet (void); + virtual void _raise (void); - virtual ~CORBA_PollableSet (void); -private: - CORBA_PollableSet (const CORBA_PollableSet &); - void operator= (const CORBA_PollableSet &); -}; + virtual void _tao_encode ( + TAO_OutputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ) const; + + virtual void _tao_decode ( + TAO_InputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ); + + + }; #endif /* end #if !defined */ + + virtual ::CORBA::DIIPollable_ptr create_dii_pollable ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void add_pollable ( + CORBA::Pollable_ptr potential + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual ::CORBA::Pollable_ptr poll ( + CORBA::ULong timeout + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , CORBA::PollableSet::NoPossiblePollable + )) = 0; + + virtual void remove ( + CORBA::Pollable_ptr potential + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , CORBA::PollableSet::UnknownPollable + )) = 0; + + virtual CORBA::UShort number_left ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; + + protected: + PollableSet (void); + + virtual ~PollableSet (void); + + private: + PollableSet (const PollableSet &); + void operator= (const PollableSet &); + }; + + +#endif /* end #if !defined */ + + +} +TAO_NAMESPACE_CLOSE // module CORBA #ifndef __ACE_INLINE__ diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i index 486f6c26e98..6fb811d052f 100644 --- a/TAO/tao/PollableC.i +++ b/TAO/tao/PollableC.i @@ -1,4 +1,4 @@ -// -*- C++ -*- $Id$ */ +// -*- C++ -*- // // $Id$ @@ -23,49 +23,6 @@ #if !defined (_CORBA_POLLABLE___CI_) #define _CORBA_POLLABLE___CI_ -ACE_INLINE CORBA_Pollable_ptr -tao_CORBA_Pollable_duplicate ( - CORBA_Pollable_ptr p - ) -{ - return CORBA_Pollable::_duplicate (p); -} - -ACE_INLINE void -tao_CORBA_Pollable_release ( - CORBA_Pollable_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE CORBA_Pollable_ptr -tao_CORBA_Pollable_nil ( - void - ) -{ - return CORBA_Pollable::_nil (); -} - -ACE_INLINE CORBA_Pollable_ptr -tao_CORBA_Pollable_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA_Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_CORBA_Pollable_upcast ( - void *src - ) -{ - CORBA_Pollable **tmp = - ACE_static_cast (CORBA_Pollable **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -73,106 +30,21 @@ tao_CORBA_Pollable_upcast ( #if !defined (_CORBA_DIIPOLLABLE___CI_) #define _CORBA_DIIPOLLABLE___CI_ -ACE_INLINE CORBA_DIIPollable_ptr -tao_CORBA_DIIPollable_duplicate ( - CORBA_DIIPollable_ptr p - ) -{ - return CORBA_DIIPollable::_duplicate (p); -} - -ACE_INLINE void -tao_CORBA_DIIPollable_release ( - CORBA_DIIPollable_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE CORBA_DIIPollable_ptr -tao_CORBA_DIIPollable_nil ( - void - ) -{ - return CORBA_DIIPollable::_nil (); -} - -ACE_INLINE CORBA_DIIPollable_ptr -tao_CORBA_DIIPollable_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA_DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_CORBA_DIIPollable_upcast ( - void *src - ) -{ - CORBA_DIIPollable **tmp = - ACE_static_cast (CORBA_DIIPollable **, src); - return *tmp; -} - #endif /* end #if !defined */ // ************************************************************* -// Inline operations for exception CORBA_PollableSet::NoPossiblePollable +// Inline operations for exception CORBA::PollableSet::NoPossiblePollable // ************************************************************* // ************************************************************* -// Inline operations for exception CORBA_PollableSet::UnknownPollable +// Inline operations for exception CORBA::PollableSet::UnknownPollable // ************************************************************* + #if !defined (_CORBA_POLLABLESET___CI_) #define _CORBA_POLLABLESET___CI_ -ACE_INLINE CORBA_PollableSet_ptr -tao_CORBA_PollableSet_duplicate ( - CORBA_PollableSet_ptr p - ) -{ - return CORBA_PollableSet::_duplicate (p); -} - -ACE_INLINE void -tao_CORBA_PollableSet_release ( - CORBA_PollableSet_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE CORBA_PollableSet_ptr -tao_CORBA_PollableSet_nil ( - void - ) -{ - return CORBA_PollableSet::_nil (); -} - -ACE_INLINE CORBA_PollableSet_ptr -tao_CORBA_PollableSet_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA_PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_CORBA_PollableSet_upcast ( - void *src - ) -{ - CORBA_PollableSet **tmp = - ACE_static_cast (CORBA_PollableSet **, src); - return *tmp; -} - #endif /* end #if !defined */ diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl index 3c9f22c6007..c480cf5a998 100644 --- a/TAO/tao/PortableInterceptor.pidl +++ b/TAO/tao/PortableInterceptor.pidl @@ -1,36 +1,36 @@ // -*- IDL -*- -// -// $Id$ - - -// ================================================================ -// -// This file was used to generate the code in PortableInterceptorC.* -// The command used to generate code is: -// -// tao_idl -// -Ge 1 -// -DCORBA3 -// -Wb,export_macro=TAO_Export -// -Wb,export_include="tao/corbafwd.h" -// -Wb,pre_include="ace/pre.h" -// -Wb,post_include="ace/post.h" -// PortableInterceptor.pidl -// -// Patches for changes to the generated code are available in the -// `diffs' directory. -// ================================================================ - - -// This file contains the interface definitions for "Portable" -// Interceptor support. -// The following is from orbos/99-12-02 Portable Interceptors spec, -// the full IDL is downloadable from orbos/99-12-02. -// -// Additional updates from ptc/00-08-05 are also included. Changes -// include: -// - addition of the Interceptor::destroy() method -// - move of CodecFactory and Codec interfaces to the IOP module +/** + * @file PortableInterceptor.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the PortableInterceptor + * components in the ORB. + * + * This file contains the interface definitions for "Portable" + * Interceptor support. + * The following is from orbos/99-12-02 Portable Interceptors spec, + * the full IDL is downloadable from orbos/99-12-02. + * + * Additional updates from ptc/00-08-05 are also included. Changes + * include: + * - addition of the Interceptor::destroy() method + * - move of CodecFactory and Codec interfaces to the IOP module + * + * This file was used to generate the code in PortableInterceptorC.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_Export + * -Wb,export_include="tao/corbafwd.h" + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * PortableInterceptor.pidl + * + * Patches for changes to the generated code are available in the + * `diffs' directory. + */ // File: PortableInterceptor.idl #ifndef _PORTABLE_INTERCEPTOR_IDL_ @@ -42,14 +42,11 @@ #include <Current.pidl> -#include <Dynamic.pidl> // changed to pidl from idl +#include <Dynamic.pidl> #include <ObjectReferenceTemplate.pidl> -//#include <IOP_N.idl> - -#define NO_VALUE // necessary to get around compile errors regarding valuetype -#include "Messaging.pidl" // this is .idl in the spec +#include <Messaging.pidl> module PortableInterceptor { diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index afc154eec1a..8da105c782d 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -27,7 +27,7 @@ #if TAO_HAS_INTERCEPTORS == 1 #include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo.h" +#include "tao/ClientRequestInfo_i.h" #include "tao/ClientInterceptorAdapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -85,7 +85,9 @@ tao_PortableInterceptor_Interceptor_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::Interceptor_var +// PortableInterceptor::Interceptor_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::Interceptor_var::Interceptor_var (void) // default constructor @@ -208,7 +210,9 @@ PortableInterceptor::Interceptor_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::Interceptor_out +// PortableInterceptor::Interceptor_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p) @@ -267,41 +271,44 @@ PortableInterceptor::Interceptor_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::Interceptor::Interceptor (void) {} - // destructor - PortableInterceptor::Interceptor::~Interceptor (void) - {} - - PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return Interceptor::_nil (); - return - ACE_reinterpret_cast - ( - Interceptor_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &Interceptor::_tao_class_id - ) - ) - ); +PortableInterceptor::Interceptor::~Interceptor (void) +{} + +PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::Interceptor_ptr +PortableInterceptor::Interceptor::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return Interceptor::_nil (); + return + ACE_reinterpret_cast + ( + Interceptor_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &Interceptor::_tao_class_id + ) + ) + ); } PortableInterceptor::Interceptor_ptr @@ -344,12 +351,6 @@ PortableInterceptor::ForwardRequest::~ForwardRequest (void) { } -void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer) -{ - ForwardRequest *tmp = ACE_static_cast (ForwardRequest*, _tao_void_pointer); - delete tmp; -} - // Copy constructor. PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -368,7 +369,12 @@ PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::For return *this; } -// Narrow. +void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer) +{ + ForwardRequest *tmp = ACE_static_cast (ForwardRequest*, _tao_void_pointer); + delete tmp; +} + PortableInterceptor::ForwardRequest * PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *exc) { @@ -382,6 +388,25 @@ PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableInterceptor::ForwardRequest, 0); + return retval; +} + +CORBA::Exception * +PortableInterceptor::ForwardRequest::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableInterceptor::ForwardRequest (*this), + 0 + ); + return result; +} + void PortableInterceptor::ForwardRequest::_raise () { TAO_RAISE (*this); @@ -413,14 +438,6 @@ void PortableInterceptor::ForwardRequest::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableInterceptor::ForwardRequest, 0); - return retval; -} - PortableInterceptor::ForwardRequest::ForwardRequest ( const CORBA::Object_ptr _tao_forward, CORBA::Boolean _tao_permanent @@ -602,12 +619,6 @@ PortableInterceptor::InvalidSlot::~InvalidSlot (void) { } -void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_pointer) -{ - InvalidSlot *tmp = ACE_static_cast (InvalidSlot*, _tao_void_pointer); - delete tmp; -} - // Copy constructor. PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -622,7 +633,12 @@ PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::Invali return *this; } -// Narrow. +void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_pointer) +{ + InvalidSlot *tmp = ACE_static_cast (InvalidSlot*, _tao_void_pointer); + delete tmp; +} + PortableInterceptor::InvalidSlot * PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *exc) { @@ -636,6 +652,25 @@ PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableInterceptor::InvalidSlot::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableInterceptor::InvalidSlot, 0); + return retval; +} + +CORBA::Exception * +PortableInterceptor::InvalidSlot::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableInterceptor::InvalidSlot (*this), + 0 + ); + return result; +} + void PortableInterceptor::InvalidSlot::_raise () { TAO_RAISE (*this); @@ -667,14 +702,6 @@ void PortableInterceptor::InvalidSlot::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableInterceptor::InvalidSlot::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableInterceptor::InvalidSlot, 0); - return retval; -} - static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -762,7 +789,9 @@ tao_PortableInterceptor_Current_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::Current_var +// PortableInterceptor::Current_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::Current_var::Current_var (void) // default constructor @@ -885,7 +914,9 @@ PortableInterceptor::Current_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::Current_out +// PortableInterceptor::Current_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::Current_out::Current_out (Current_ptr &p) @@ -944,41 +975,44 @@ PortableInterceptor::Current_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::Current::Current (void) {} - // destructor - PortableInterceptor::Current::~Current (void) - {} - - PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::Current_ptr PortableInterceptor::Current::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return Current::_nil (); - return - ACE_reinterpret_cast - ( - Current_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &Current::_tao_class_id - ) - ) - ); +PortableInterceptor::Current::~Current (void) +{} + +PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::Current_ptr +PortableInterceptor::Current::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return Current::_nil (); + return + ACE_reinterpret_cast + ( + Current_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &Current::_tao_class_id + ) + ) + ); } PortableInterceptor::Current_ptr @@ -1068,7 +1102,9 @@ tao_PortableInterceptor_RequestInfo_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::RequestInfo_var +// PortableInterceptor::RequestInfo_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::RequestInfo_var::RequestInfo_var (void) // default constructor @@ -1191,7 +1227,9 @@ PortableInterceptor::RequestInfo_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::RequestInfo_out +// PortableInterceptor::RequestInfo_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p) @@ -1250,41 +1288,44 @@ PortableInterceptor::RequestInfo_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::RequestInfo::RequestInfo (void) {} - // destructor - PortableInterceptor::RequestInfo::~RequestInfo (void) - {} - - PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return RequestInfo::_nil (); - return - ACE_reinterpret_cast - ( - RequestInfo_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &RequestInfo::_tao_class_id - ) - ) - ); +PortableInterceptor::RequestInfo::~RequestInfo (void) +{} + +PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::RequestInfo_ptr +PortableInterceptor::RequestInfo::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return RequestInfo::_nil (); + return + ACE_reinterpret_cast + ( + RequestInfo_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RequestInfo::_tao_class_id + ) + ) + ); } PortableInterceptor::RequestInfo_ptr @@ -1362,7 +1403,9 @@ tao_PortableInterceptor_ClientRequestInfo_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::ClientRequestInfo_var +// PortableInterceptor::ClientRequestInfo_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void) // default constructor @@ -1485,7 +1528,9 @@ PortableInterceptor::ClientRequestInfo_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::ClientRequestInfo_out +// PortableInterceptor::ClientRequestInfo_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_ptr &p) @@ -1544,41 +1589,44 @@ PortableInterceptor::ClientRequestInfo_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void) {} - // destructor - PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void) - {} - - PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ClientRequestInfo::_nil (); - return - ACE_reinterpret_cast - ( - ClientRequestInfo_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ClientRequestInfo::_tao_class_id - ) - ) - ); +PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void) +{} + +PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::ClientRequestInfo_ptr +PortableInterceptor::ClientRequestInfo::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ClientRequestInfo::_nil (); + return + ACE_reinterpret_cast + ( + ClientRequestInfo_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ClientRequestInfo::_tao_class_id + ) + ) + ); } PortableInterceptor::ClientRequestInfo_ptr @@ -1668,7 +1716,9 @@ tao_PortableInterceptor_ServerRequestInfo_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::ServerRequestInfo_var +// PortableInterceptor::ServerRequestInfo_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void) // default constructor @@ -1791,7 +1841,9 @@ PortableInterceptor::ServerRequestInfo_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::ServerRequestInfo_out +// PortableInterceptor::ServerRequestInfo_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_ptr &p) @@ -1850,41 +1902,44 @@ PortableInterceptor::ServerRequestInfo_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void) {} - // destructor - PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void) - {} - - PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ServerRequestInfo::_nil (); - return - ACE_reinterpret_cast - ( - ServerRequestInfo_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ServerRequestInfo::_tao_class_id - ) - ) - ); +PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void) +{} + +PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::ServerRequestInfo_ptr +PortableInterceptor::ServerRequestInfo::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ServerRequestInfo::_nil (); + return + ACE_reinterpret_cast + ( + ServerRequestInfo_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServerRequestInfo::_tao_class_id + ) + ) + ); } PortableInterceptor::ServerRequestInfo_ptr @@ -1974,7 +2029,9 @@ tao_PortableInterceptor_ClientRequestInterceptor_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::ClientRequestInterceptor_var +// PortableInterceptor::ClientRequestInterceptor_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void) // default constructor @@ -2097,7 +2154,9 @@ PortableInterceptor::ClientRequestInterceptor_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::ClientRequestInterceptor_out +// PortableInterceptor::ClientRequestInterceptor_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &p) @@ -2156,41 +2215,44 @@ PortableInterceptor::ClientRequestInterceptor_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void) {} - // destructor - PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void) - {} - - PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ClientRequestInterceptor::_nil (); - return - ACE_reinterpret_cast - ( - ClientRequestInterceptor_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ClientRequestInterceptor::_tao_class_id - ) - ) - ); +PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void) +{} + +PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::ClientRequestInterceptor_ptr +PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ClientRequestInterceptor::_nil (); + return + ACE_reinterpret_cast + ( + ClientRequestInterceptor_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ClientRequestInterceptor::_tao_class_id + ) + ) + ); } PortableInterceptor::ClientRequestInterceptor_ptr @@ -2280,7 +2342,9 @@ tao_PortableInterceptor_ServerRequestInterceptor_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::ServerRequestInterceptor_var +// PortableInterceptor::ServerRequestInterceptor_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void) // default constructor @@ -2403,7 +2467,9 @@ PortableInterceptor::ServerRequestInterceptor_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::ServerRequestInterceptor_out +// PortableInterceptor::ServerRequestInterceptor_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &p) @@ -2462,41 +2528,44 @@ PortableInterceptor::ServerRequestInterceptor_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) {} - // destructor - PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) - {} - - PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ServerRequestInterceptor::_nil (); - return - ACE_reinterpret_cast - ( - ServerRequestInterceptor_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ServerRequestInterceptor::_tao_class_id - ) - ) - ); +PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) +{} + +PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::ServerRequestInterceptor_ptr +PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ServerRequestInterceptor::_nil (); + return + ACE_reinterpret_cast + ( + ServerRequestInterceptor_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServerRequestInterceptor::_tao_class_id + ) + ) + ); } PortableInterceptor::ServerRequestInterceptor_ptr @@ -2586,7 +2655,9 @@ tao_PortableInterceptor_IORInfo_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::IORInfo_var +// PortableInterceptor::IORInfo_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::IORInfo_var::IORInfo_var (void) // default constructor @@ -2709,7 +2780,9 @@ PortableInterceptor::IORInfo_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::IORInfo_out +// PortableInterceptor::IORInfo_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p) @@ -2768,41 +2841,44 @@ PortableInterceptor::IORInfo_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::IORInfo::IORInfo (void) {} - // destructor - PortableInterceptor::IORInfo::~IORInfo (void) - {} - - PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return IORInfo::_nil (); - return - ACE_reinterpret_cast - ( - IORInfo_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &IORInfo::_tao_class_id - ) - ) - ); +PortableInterceptor::IORInfo::~IORInfo (void) +{} + +PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::IORInfo_ptr +PortableInterceptor::IORInfo::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return IORInfo::_nil (); + return + ACE_reinterpret_cast + ( + IORInfo_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &IORInfo::_tao_class_id + ) + ) + ); } PortableInterceptor::IORInfo_ptr @@ -2880,7 +2956,9 @@ tao_PortableInterceptor_IORInterceptor_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::IORInterceptor_var +// PortableInterceptor::IORInterceptor_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void) // default constructor @@ -3003,7 +3081,9 @@ PortableInterceptor::IORInterceptor_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::IORInterceptor_out +// PortableInterceptor::IORInterceptor_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr &p) @@ -3062,41 +3142,44 @@ PortableInterceptor::IORInterceptor_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::IORInterceptor::IORInterceptor (void) {} - // destructor - PortableInterceptor::IORInterceptor::~IORInterceptor (void) - {} - - PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return IORInterceptor::_nil (); - return - ACE_reinterpret_cast - ( - IORInterceptor_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &IORInterceptor::_tao_class_id - ) - ) - ); +PortableInterceptor::IORInterceptor::~IORInterceptor (void) +{} + +PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::IORInterceptor_ptr +PortableInterceptor::IORInterceptor::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return IORInterceptor::_nil (); + return + ACE_reinterpret_cast + ( + IORInterceptor_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &IORInterceptor::_tao_class_id + ) + ) + ); } PortableInterceptor::IORInterceptor_ptr @@ -3186,7 +3269,9 @@ tao_PortableInterceptor_PolicyFactory_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::PolicyFactory_var +// PortableInterceptor::PolicyFactory_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void) // default constructor @@ -3309,7 +3394,9 @@ PortableInterceptor::PolicyFactory_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::PolicyFactory_out +// PortableInterceptor::PolicyFactory_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p) @@ -3368,41 +3455,44 @@ PortableInterceptor::PolicyFactory_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::PolicyFactory::PolicyFactory (void) {} - // destructor - PortableInterceptor::PolicyFactory::~PolicyFactory (void) - {} - - PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return PolicyFactory::_nil (); - return - ACE_reinterpret_cast - ( - PolicyFactory_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &PolicyFactory::_tao_class_id - ) - ) - ); +PortableInterceptor::PolicyFactory::~PolicyFactory (void) +{} + +PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::PolicyFactory_ptr +PortableInterceptor::PolicyFactory::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return PolicyFactory::_nil (); + return + ACE_reinterpret_cast + ( + PolicyFactory_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &PolicyFactory::_tao_class_id + ) + ) + ); } PortableInterceptor::PolicyFactory_ptr @@ -3480,7 +3570,9 @@ tao_PortableInterceptor_ORBInitInfo_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::ORBInitInfo_var +// PortableInterceptor::ORBInitInfo_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void) // default constructor @@ -3603,7 +3695,9 @@ PortableInterceptor::ORBInitInfo_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::ORBInitInfo_out +// PortableInterceptor::ORBInitInfo_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p) @@ -3662,41 +3756,44 @@ PortableInterceptor::ORBInitInfo_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::ORBInitInfo::ORBInitInfo (void) {} - // destructor - PortableInterceptor::ORBInitInfo::~ORBInitInfo (void) - {} - - PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ORBInitInfo::_nil (); - return - ACE_reinterpret_cast - ( - ORBInitInfo_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ORBInitInfo::_tao_class_id - ) - ) - ); +PortableInterceptor::ORBInitInfo::~ORBInitInfo (void) +{} + +PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::ORBInitInfo_ptr +PortableInterceptor::ORBInitInfo::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ORBInitInfo::_nil (); + return + ACE_reinterpret_cast + ( + ORBInitInfo_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ORBInitInfo::_tao_class_id + ) + ) + ); } PortableInterceptor::ORBInitInfo_ptr @@ -3755,7 +3852,6 @@ PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInte return *this; } -// Narrow. PortableInterceptor::ORBInitInfo::DuplicateName * PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *exc) { @@ -3769,6 +3865,25 @@ PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *ex } } +CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::DuplicateName, 0); + return retval; +} + +CORBA::Exception * +PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableInterceptor::ORBInitInfo::DuplicateName (*this), + 0 + ); + return result; +} + void PortableInterceptor::ORBInitInfo::DuplicateName::_raise () { TAO_RAISE (*this); @@ -3790,14 +3905,6 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::DuplicateName, 0); - return retval; -} - PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName ( const char * _tao_name ) @@ -3831,7 +3938,6 @@ PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterc return *this; } -// Narrow. PortableInterceptor::ORBInitInfo::InvalidName * PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *exc) { @@ -3845,6 +3951,25 @@ PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::InvalidName, 0); + return retval; +} + +CORBA::Exception * +PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableInterceptor::ORBInitInfo::InvalidName (*this), + 0 + ); + return result; +} + void PortableInterceptor::ORBInitInfo::InvalidName::_raise () { TAO_RAISE (*this); @@ -3866,14 +3991,6 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::InvalidName, 0); - return retval; -} - int PortableInterceptor::ORBInitializer::_tao_class_id = 0; PortableInterceptor::ORBInitializer_ptr @@ -3920,7 +4037,9 @@ tao_PortableInterceptor_ORBInitializer_upcast ( } // ************************************************************* -// Operations for class PortableInterceptor::ORBInitializer_var +// PortableInterceptor::ORBInitializer_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void) // default constructor @@ -4043,7 +4162,9 @@ PortableInterceptor::ORBInitializer_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableInterceptor::ORBInitializer_out +// PortableInterceptor::ORBInitializer_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr &p) @@ -4102,41 +4223,44 @@ PortableInterceptor::ORBInitializer_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableInterceptor::ORBInitializer::ORBInitializer (void) {} - // destructor - PortableInterceptor::ORBInitializer::~ORBInitializer (void) - {} - - PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ORBInitializer::_nil (); - return - ACE_reinterpret_cast - ( - ORBInitializer_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ORBInitializer::_tao_class_id - ) - ) - ); +PortableInterceptor::ORBInitializer::~ORBInitializer (void) +{} + +PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableInterceptor::ORBInitializer_ptr +PortableInterceptor::ORBInitializer::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ORBInitializer::_nil (); + return + ACE_reinterpret_cast + ( + ORBInitializer_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ORBInitializer::_tao_class_id + ) + ) + ); } PortableInterceptor::ORBInitializer_ptr @@ -4431,4 +4555,3 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index d8ef289f438..2fa57de92ff 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_PORTABLEINTERCEPTORC_H_ -#define _TAO_IDL_PORTABLEINTERCEPTORC_H_ +#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_ +#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_ #include "ace/pre.h" #include "tao/corbafwd.h" @@ -29,11 +29,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "TAO_Export.h" +#include "CurrentC.h" #include "DynamicC.h" +#include "ObjectReferenceTemplateC.h" #include "MessagingC.h" -#include "CurrentC.h" +#include "IOPC.h" #include "PolicyC.h" -#include "ObjectReferenceTemplateC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -173,6 +175,7 @@ TAO_NAMESPACE PortableInterceptor } virtual char * name ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -180,6 +183,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; virtual void destroy ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -214,17 +218,17 @@ TAO_NAMESPACE PortableInterceptor CORBA::Boolean permanent; ForwardRequest (void); - // Default constructor. - ForwardRequest (const ForwardRequest &); - // Copy constructor. - ~ForwardRequest (void); - // Destructor. + + ForwardRequest &operator= (const ForwardRequest &); static void _tao_any_destructor (void*); - ForwardRequest &operator= (const ForwardRequest &); + static ForwardRequest *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -238,17 +242,13 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_NOT_USED ); - static ForwardRequest *_downcast (CORBA::Exception *); - - ForwardRequest ( + ForwardRequest ( const CORBA::Object_ptr _tao_forward, CORBA::Boolean _tao_permanent ); - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception PortableInterceptor::ForwardRequest. + }; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; @@ -284,17 +284,17 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; public: InvalidSlot (void); - // Default constructor. - InvalidSlot (const InvalidSlot &); - // Copy constructor. - ~InvalidSlot (void); - // Destructor. + + InvalidSlot &operator= (const InvalidSlot &); static void _tao_any_destructor (void*); - InvalidSlot &operator= (const InvalidSlot &); + static InvalidSlot *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -308,13 +308,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; ACE_ENV_ARG_DECL_NOT_USED ); - static InvalidSlot *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception PortableInterceptor::InvalidSlot. + }; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; @@ -434,20 +430,22 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; } virtual CORBA::Any * get_slot ( - PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::SlotId id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::InvalidSlot + CORBA::SystemException + , PortableInterceptor::InvalidSlot )) = 0; virtual void set_slot ( PortableInterceptor::SlotId id, - const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::Any & data + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::InvalidSlot + CORBA::SystemException + , PortableInterceptor::InvalidSlot )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -580,6 +578,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; } virtual CORBA::ULong request_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -587,6 +586,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual char * operation ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -594,6 +594,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::Dynamic::ParameterList * arguments ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -601,6 +602,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::Dynamic::ExceptionList * exceptions ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -608,6 +610,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::Dynamic::ContextList * contexts ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -615,6 +618,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::Dynamic::RequestContext * operation_context ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -622,6 +626,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual CORBA::Any * result ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -629,6 +634,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual CORBA::Boolean response_expected ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -636,17 +642,17 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; #if TAO_HAS_CORBA_MESSAGING == 1 - virtual Messaging::SyncScope sync_scope ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - -#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ virtual PortableInterceptor::ReplyStatus reply_status ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -654,6 +660,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual CORBA::Object_ptr forward_reference ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -661,22 +668,25 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual CORBA::Any * get_slot ( - PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::SlotId id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::InvalidSlot + CORBA::SystemException + , PortableInterceptor::InvalidSlot )) = 0; virtual ::IOP::ServiceContext * get_request_service_context ( - IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ServiceId id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::IOP::ServiceContext * get_reply_service_context ( - IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ServiceId id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -812,6 +822,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; } virtual CORBA::Object_ptr target ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -819,6 +830,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual CORBA::Object_ptr effective_target ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -826,6 +838,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::IOP::TaggedProfile * effective_profile ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -833,6 +846,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual CORBA::Any * received_exception ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -840,6 +854,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual char * received_exception_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -847,21 +862,24 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::IOP::TaggedComponent * get_effective_component ( - IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ComponentId id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::IOP::TaggedComponentSeq * get_effective_components ( - IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ComponentId id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::CORBA::Policy_ptr get_request_policy ( - CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::PolicyType type + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -869,7 +887,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual void add_request_service_context ( const IOP::ServiceContext & service_context, - CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean replace + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1005,6 +1024,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; } virtual CORBA::Any * sending_exception ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1012,6 +1032,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual char * server_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1019,6 +1040,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual char * orb_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1026,6 +1048,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::PortableInterceptor::AdapterName * adapter_name ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1033,6 +1056,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::CORBA::OctetSeq * object_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1040,6 +1064,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::CORBA::OctetSeq * adapter_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1047,6 +1072,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual char * target_most_derived_interface ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1054,7 +1080,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::CORBA::Policy_ptr get_server_policy ( - CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::PolicyType type + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1062,15 +1089,17 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual void set_slot ( PortableInterceptor::SlotId id, - const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::Any & data + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::InvalidSlot + CORBA::SystemException + , PortableInterceptor::InvalidSlot )) = 0; virtual CORBA::Boolean target_is_a ( - const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS + const char * id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1078,7 +1107,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual void add_reply_service_context ( const IOP::ServiceContext & service_context, - CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean replace + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1214,41 +1244,46 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; } virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest + CORBA::SystemException + , PortableInterceptor::ForwardRequest )) = 0; virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest + CORBA::SystemException + , PortableInterceptor::ForwardRequest )) = 0; virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest + CORBA::SystemException + , PortableInterceptor::ForwardRequest )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1381,42 +1416,47 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; } virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest + CORBA::SystemException + , PortableInterceptor::ForwardRequest )) = 0; virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest + CORBA::SystemException + , PortableInterceptor::ForwardRequest )) = 0; virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest + CORBA::SystemException + , PortableInterceptor::ForwardRequest )) = 0; virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInfo_ptr ri + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest + CORBA::SystemException + , PortableInterceptor::ForwardRequest )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1549,14 +1589,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; } virtual ::CORBA::Policy_ptr get_effective_policy ( - CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::PolicyType type + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void add_ior_component ( - const IOP::TaggedComponent & component ACE_ENV_ARG_DECL_WITH_DEFAULTS + const IOP::TaggedComponent & component + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1564,13 +1606,15 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual void add_ior_component_to_profile ( const IOP::TaggedComponent & component, - IOP::ProfileId profile_id ACE_ENV_ARG_DECL_WITH_DEFAULTS + IOP::ProfileId profile_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual PortableInterceptor::AdapterManagerId manager_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1578,6 +1622,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual PortableInterceptor::AdapterState state ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1585,6 +1630,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1592,6 +1638,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1599,7 +1646,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual void current_factory ( - PortableInterceptor::ObjectReferenceFactory * current_factory ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ObjectReferenceFactory * current_factory + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1735,14 +1783,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; } virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::IORInfo_ptr info + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void components_established ( - PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::IORInfo_ptr info + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1750,7 +1800,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual void adapter_manager_state_changed ( PortableInterceptor::AdapterManagerId id, - PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::AdapterState state + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1758,7 +1809,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, - PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::AdapterState state + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1895,11 +1947,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual ::CORBA::Policy_ptr create_policy ( CORBA::PolicyType type, - const CORBA::Any & value ACE_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::Any & value + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - CORBA::PolicyError + CORBA::SystemException + , CORBA::PolicyError )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2044,16 +2097,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; TAO_String_Manager name; DuplicateName (void); - // Default constructor. - DuplicateName (const DuplicateName &); - // Copy constructor. - ~DuplicateName (void); - // Destructor. DuplicateName &operator= (const DuplicateName &); + static DuplicateName *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2066,15 +2119,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; ACE_ENV_ARG_DECL_NOT_USED ); - static DuplicateName *_downcast (CORBA::Exception *); - - DuplicateName ( + DuplicateName ( const char * _tao_name ); - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableInterceptor::ORBInitInfo::DuplicateName. + }; #endif /* end #if !defined */ @@ -2088,16 +2137,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; public: InvalidName (void); - // Default constructor. - InvalidName (const InvalidName &); - // Copy constructor. - ~InvalidName (void); - // Destructor. InvalidName &operator= (const InvalidName &); + static InvalidName *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2110,17 +2159,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; ACE_ENV_ARG_DECL_NOT_USED ); - static InvalidName *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableInterceptor::ORBInitInfo::InvalidName. + }; #endif /* end #if !defined */ virtual ::CORBA::StringSeq * arguments ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2128,6 +2174,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual char * orb_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2135,6 +2182,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; )) = 0; virtual ::IOP::CodecFactory_ptr codec_factory ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2143,46 +2191,52 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual void register_initial_reference ( const char * id, - CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ORBInitInfo::InvalidName + CORBA::SystemException + , PortableInterceptor::ORBInitInfo::InvalidName )) = 0; virtual CORBA::Object_ptr resolve_initial_references ( - const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS + const char * id + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ORBInitInfo::InvalidName + CORBA::SystemException + , PortableInterceptor::ORBInitInfo::InvalidName )) = 0; virtual void add_client_request_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ClientRequestInterceptor_ptr interceptor + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName + CORBA::SystemException + , PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; virtual void add_server_request_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ServerRequestInterceptor_ptr interceptor + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName + CORBA::SystemException + , PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; virtual void add_ior_interceptor ( - PortableInterceptor::IORInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::IORInterceptor_ptr interceptor + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName + CORBA::SystemException + , PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; virtual PortableInterceptor::SlotId allocate_slot_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2191,7 +2245,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; virtual void register_policy_factory ( CORBA::PolicyType type, - PortableInterceptor::PolicyFactory_ptr policy_factory ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::PolicyFactory_ptr policy_factory + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2221,6 +2276,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; class ORBInitializer; typedef ORBInitializer *ORBInitializer_ptr; + /// Register an ORBInitializer with the global ORBInitializer + /// table. + TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( + ORBInitializer_ptr init + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + #endif /* end #if !defined */ @@ -2266,11 +2327,6 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; ORBInitializer_var &operator= (const TAO_Base_var &rhs); }; -/// Register an ORBInitializer with the global ORBInitializer -/// table. -TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( - ORBInitializer_ptr init - ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* end #if !defined */ @@ -2332,14 +2388,16 @@ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( } virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ORBInitInfo_ptr info + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableInterceptor::ORBInitInfo_ptr info + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2371,6 +2429,11 @@ TAO_NAMESPACE OBV_PortableInterceptor } TAO_NAMESPACE_CLOSE +TAO_NAMESPACE OBV_Messaging +{ +} +TAO_NAMESPACE_CLOSE + TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.h b/TAO/tao/PortableServer/AMH_Response_Handler.h index 45ec7d10a49..2c2b167098c 100644 --- a/TAO/tao/PortableServer/AMH_Response_Handler.h +++ b/TAO/tao/PortableServer/AMH_Response_Handler.h @@ -14,11 +14,12 @@ #ifndef TAO_AMH_RESPONSE_HANDLER_H #define TAO_AMH_RESPONSE_HANDLER_H +#include "portableserver_export.h" + #include "tao/Service_Context.h" +#include "tao/CDR.h" #include "ace/Synch_T.h" -#include "portableserver_export.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -155,7 +156,7 @@ private: // @@ Mayur: it depends on what form of the "State Pattern" you // use. The more generic form, as described in GoF, uses a class // for each state, super-elegant but indeed a bit heavy handed. - // The lighter-weight form (using a state variable + // The lighter-weight form (using a state variable /// Mutex to ensure the AMH-RH method call is thread-safe. TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl new file mode 100644 index 00000000000..e4580e8df89 --- /dev/null +++ b/TAO/tao/PortableServer/Default_ORT.pidl @@ -0,0 +1,43 @@ +// -*- IDL -*- +/** + * @file Default_ORT.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the TAO_Default_ORT module. + * + * This file is used to generate Default_ORTC.{h,i,cpp}, using the following + * command: + * + * tao_idl.exe + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_PortableServer_Export + * -Wb,export_include=portableserver_export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * Default_ORT.pidl + * + * and then: + * + * cp orig/Default_ORT.{h,i,cpp} . + * patch < diffs/Default_ORT.diff + * + * The code left in Default_ORTC.{h,i,cpp} is + * ready for use. + * + */ + +#ifndef TAO_DEFAULT_ORT_PIDL +#define TAO_DEFAULT_ORT_PIDL + +#include <ObjectReferenceTemplate.pidl> + +module TAO_Default_ORT +{ + valuetype ObjectReferenceFactory : PortableInterceptor::ObjectReferenceFactory {}; + + valuetype ObjectReferenceTemplate : PortableInterceptor::ObjectReferenceTemplate {}; +}; + +#endif /* TAO_DEFAULT_ORT_PIDL */ + diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp new file mode 100644 index 00000000000..e88494c1f57 --- /dev/null +++ b/TAO/tao/PortableServer/Default_ORTC.cpp @@ -0,0 +1,883 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "Default_ORTC.h" + +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "Default_ORTC.i" +#endif /* !defined INLINE */ + +static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceFactory[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 47, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x54414f5f), + ACE_NTOHL (0x44656661), + ACE_NTOHL (0x756c745f), + ACE_NTOHL (0x4f52542f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x72793a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:TAO_Default_ORT/ObjectReferenceFactory:1.0 + 23, + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x72790000), // name = ObjectReferenceFactory + 0, // value modifier + CORBA::tk_null, // no stateful base valuetype + + 0, // member count +}; + +static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceFactory ( + CORBA::tk_value, + sizeof (_oc_TAO_Default_ORT_ObjectReferenceFactory), + (char *) &_oc_TAO_Default_ORT_ObjectReferenceFactory, + 0, + sizeof (TAO_Default_ORT::ObjectReferenceFactory) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (TAO_Default_ORT) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceFactory, &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceFactory) +TAO_NAMESPACE_END + +// ************************************************************* +// Operations for class TAO_Default_ORT::ObjectReferenceFactory_var +// ************************************************************* + +TAO_Default_ORT::ObjectReferenceFactory_var::ObjectReferenceFactory_var (void) // default constructor + : ptr_ (0) +{} + +TAO_Default_ORT::ObjectReferenceFactory_var::ObjectReferenceFactory_var (ObjectReferenceFactory* p) + : ptr_ (p) +{} + +TAO_Default_ORT::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory* p) + : ptr_ (ACE_const_cast(ObjectReferenceFactory*, p)) +{} + +TAO_Default_ORT::ObjectReferenceFactory* +TAO_Default_ORT::ObjectReferenceFactory_var::ptr (void) const +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory_var &p) // copy constructor +{ + CORBA::add_ref (p.ptr ()); + this->ptr_ = p.ptr (); +} + +TAO_Default_ORT::ObjectReferenceFactory_var::~ObjectReferenceFactory_var (void) // destructor +{ + CORBA::remove_ref (this->ptr_); +} + +TAO_Default_ORT::ObjectReferenceFactory_var & +TAO_Default_ORT::ObjectReferenceFactory_var::operator= (ObjectReferenceFactory* p) +{ + CORBA::remove_ref (this->ptr_); + this->ptr_ = p; + return *this; +} + +TAO_Default_ORT::ObjectReferenceFactory_var & +TAO_Default_ORT::ObjectReferenceFactory_var::operator= (const ObjectReferenceFactory_var &p) +{ + if (this != &p) + { + CORBA::remove_ref (this->ptr_); + ObjectReferenceFactory* tmp = p.ptr (); + CORBA::add_ref (tmp); + this->ptr_ = tmp; + } + return *this; +} + +TAO_Default_ORT::ObjectReferenceFactory_var::operator const TAO_Default_ORT::ObjectReferenceFactory* () const // cast +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory_var::operator TAO_Default_ORT::ObjectReferenceFactory* () // cast +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory* +TAO_Default_ORT::ObjectReferenceFactory_var::operator-> (void) const +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory* +TAO_Default_ORT::ObjectReferenceFactory_var::in (void) const +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory* & +TAO_Default_ORT::ObjectReferenceFactory_var::inout (void) +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory* & +TAO_Default_ORT::ObjectReferenceFactory_var::out (void) +{ + CORBA::remove_ref (this->ptr_); + this->ptr_ = 0; + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory* +TAO_Default_ORT::ObjectReferenceFactory_var::_retn (void) +{ + // yield ownership of managed obj reference + ObjectReferenceFactory* tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +// ************************************************************* +// Operations for class TAO_Default_ORT::ObjectReferenceFactory_out +// ************************************************************* + +TAO_Default_ORT::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory* &p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +TAO_Default_ORT::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + CORBA::remove_ref (this->ptr_); + this->ptr_ = 0; +} + +TAO_Default_ORT::ObjectReferenceFactory_out::ObjectReferenceFactory_out (const ObjectReferenceFactory_out &p) // copy constructor + : ptr_ (ACE_const_cast (ObjectReferenceFactory_out&,p).ptr_) +{} + +TAO_Default_ORT::ObjectReferenceFactory_out & +TAO_Default_ORT::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_out &p) +{ + this->ptr_ = ACE_const_cast (ObjectReferenceFactory_out&,p).ptr_; + return *this; +} + +TAO_Default_ORT::ObjectReferenceFactory_out & +TAO_Default_ORT::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_var &p) +{ + ObjectReferenceFactory* tmp = p.ptr (); + CORBA::add_ref (tmp); + this->ptr_ = tmp; + return *this; +} + +TAO_Default_ORT::ObjectReferenceFactory_out & +TAO_Default_ORT::ObjectReferenceFactory_out::operator= (ObjectReferenceFactory* p) +{ + this->ptr_ = p; + return *this; +} + +TAO_Default_ORT::ObjectReferenceFactory_out::operator TAO_Default_ORT::ObjectReferenceFactory* &() // cast +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory* & +TAO_Default_ORT::ObjectReferenceFactory_out::ptr (void) // ptr +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory* +TAO_Default_ORT::ObjectReferenceFactory_out::operator-> (void) +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceFactory* TAO_Default_ORT::ObjectReferenceFactory::_downcast (CORBA::ValueBase* v) +{ + if (v == 0) return 0; + return (ObjectReferenceFactory* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast); +} + +const char* TAO_Default_ORT::ObjectReferenceFactory::_tao_obv_repository_id () const +{ + return this->_tao_obv_static_repository_id (); +} + +void* TAO_Default_ORT::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id) +{ + if (type_id == (ptr_arith_t) &_downcast) + return this; + void *rval = 0; + if (rval == 0) + rval = ACE_NESTED_CLASS (PortableInterceptor,ObjectReferenceFactory)::_tao_obv_narrow (type_id); + return rval; +} + +void +TAO_Default_ORT::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer) +{ + ObjectReferenceFactory *tmp = ACE_static_cast (ObjectReferenceFactory*, _tao_void_pointer); + delete tmp; +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceFactory::_tao_marshal_v (TAO_OutputCDR & strm) +{ + return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceFactory (strm); +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal_v (TAO_InputCDR & strm) +{ + return this->_tao_unmarshal__TAO_Default_ORT_ObjectReferenceFactory (strm); +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal (TAO_InputCDR &strm, ObjectReferenceFactory *&new_object) +{ + CORBA::Boolean retval = 1; + CORBA::ValueBase *base; // %! should be a _var + CORBA::ValueFactory_ptr factory; // %! should be a _var + if (!CORBA::ValueBase::_tao_unmarshal_pre (strm, factory, base, + ObjectReferenceFactory::_tao_obv_static_repository_id ()) ) + { + return 0; + } + if (factory != 0) + { + base = factory->create_for_unmarshal (); + factory->_remove_ref (); + if (base == 0) return 0; // %! except.? + //%! ACE_DEBUG ((LM_DEBUG, "TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal %s\n", base->_tao_obv_repository_id () )); + retval = base->_tao_unmarshal_v (strm); + //%! ACE_DEBUG ((LM_DEBUG, "TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal retval unmarshal_v is %d\n", retval)); + if (!retval) return 0; + } + // Now base must be null or point to the unmarshaled object. + // Align the pointer to the right subobject. + new_object = ObjectReferenceFactory::_downcast (base); + // %! unmarshal_post + return 1; +} + +static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 48, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x54414f5f), + ACE_NTOHL (0x44656661), + ACE_NTOHL (0x756c745f), + ACE_NTOHL (0x4f52542f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x312e3000), // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0 + 24, + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate + 0, // value modifier + CORBA::tk_null, // no stateful base valuetype + + 0, // member count +}; + +static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate ( + CORBA::tk_value, + sizeof (_oc_TAO_Default_ORT_ObjectReferenceTemplate), + (char *) &_oc_TAO_Default_ORT_ObjectReferenceTemplate, + 0, + sizeof (TAO_Default_ORT::ObjectReferenceTemplate) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (TAO_Default_ORT) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceTemplate, &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate) +TAO_NAMESPACE_END + +// ************************************************************* +// Operations for class TAO_Default_ORT::ObjectReferenceTemplate_var +// ************************************************************* + +TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void) // default constructor + : ptr_ (0) +{} + +TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (ObjectReferenceTemplate* p) + : ptr_ (p) +{} + +TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate* p) + : ptr_ (ACE_const_cast(ObjectReferenceTemplate*, p)) +{} + +TAO_Default_ORT::ObjectReferenceTemplate* +TAO_Default_ORT::ObjectReferenceTemplate_var::ptr (void) const +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p) // copy constructor +{ + CORBA::add_ref (p.ptr ()); + this->ptr_ = p.ptr (); +} + +TAO_Default_ORT::ObjectReferenceTemplate_var::~ObjectReferenceTemplate_var (void) // destructor +{ + CORBA::remove_ref (this->ptr_); +} + +TAO_Default_ORT::ObjectReferenceTemplate_var & +TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate* p) +{ + CORBA::remove_ref (this->ptr_); + this->ptr_ = p; + return *this; +} + +TAO_Default_ORT::ObjectReferenceTemplate_var & +TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (const ObjectReferenceTemplate_var &p) +{ + if (this != &p) + { + CORBA::remove_ref (this->ptr_); + ObjectReferenceTemplate* tmp = p.ptr (); + CORBA::add_ref (tmp); + this->ptr_ = tmp; + } + return *this; +} + +TAO_Default_ORT::ObjectReferenceTemplate_var::operator const TAO_Default_ORT::ObjectReferenceTemplate* () const // cast +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate_var::operator TAO_Default_ORT::ObjectReferenceTemplate* () // cast +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate* +TAO_Default_ORT::ObjectReferenceTemplate_var::operator-> (void) const +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate* +TAO_Default_ORT::ObjectReferenceTemplate_var::in (void) const +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate* & +TAO_Default_ORT::ObjectReferenceTemplate_var::inout (void) +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate* & +TAO_Default_ORT::ObjectReferenceTemplate_var::out (void) +{ + CORBA::remove_ref (this->ptr_); + this->ptr_ = 0; + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate* +TAO_Default_ORT::ObjectReferenceTemplate_var::_retn (void) +{ + // yield ownership of managed obj reference + ObjectReferenceTemplate* tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +// ************************************************************* +// Operations for class TAO_Default_ORT::ObjectReferenceTemplate_out +// ************************************************************* + +TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate* &p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + CORBA::remove_ref (this->ptr_); + this->ptr_ = 0; +} + +TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p) // copy constructor + : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&,p).ptr_) +{} + +TAO_Default_ORT::ObjectReferenceTemplate_out & +TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_out &p) +{ + this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&,p).ptr_; + return *this; +} + +TAO_Default_ORT::ObjectReferenceTemplate_out & +TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_var &p) +{ + ObjectReferenceTemplate* tmp = p.ptr (); + CORBA::add_ref (tmp); + this->ptr_ = tmp; + return *this; +} + +TAO_Default_ORT::ObjectReferenceTemplate_out & +TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate* p) +{ + this->ptr_ = p; + return *this; +} + +TAO_Default_ORT::ObjectReferenceTemplate_out::operator TAO_Default_ORT::ObjectReferenceTemplate* &() // cast +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate* & +TAO_Default_ORT::ObjectReferenceTemplate_out::ptr (void) // ptr +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate* +TAO_Default_ORT::ObjectReferenceTemplate_out::operator-> (void) +{ + return this->ptr_; +} + +TAO_Default_ORT::ObjectReferenceTemplate* TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase* v) +{ + if (v == 0) return 0; + return (ObjectReferenceTemplate* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast); +} + +const char* TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id () const +{ + return this->_tao_obv_static_repository_id (); +} + +void* TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id) +{ + if (type_id == (ptr_arith_t) &_downcast) + return this; + void *rval = 0; + if (rval == 0) + rval = ACE_NESTED_CLASS (PortableInterceptor,ObjectReferenceTemplate)::_tao_obv_narrow (type_id); + return rval; +} + +void +TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer) +{ + ObjectReferenceTemplate *tmp = ACE_static_cast (ObjectReferenceTemplate*, _tao_void_pointer); + delete tmp; +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm) +{ + return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (strm); +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR & strm) +{ + return this->_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (strm); +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (TAO_InputCDR &strm, ObjectReferenceTemplate *&new_object) +{ + CORBA::Boolean retval = 1; + CORBA::ValueBase *base; // %! should be a _var + CORBA::ValueFactory_ptr factory; // %! should be a _var + if (!CORBA::ValueBase::_tao_unmarshal_pre (strm, factory, base, + ObjectReferenceTemplate::_tao_obv_static_repository_id ()) ) + { + return 0; + } + if (factory != 0) + { + base = factory->create_for_unmarshal (); + factory->_remove_ref (); + if (base == 0) return 0; // %! except.? + //%! ACE_DEBUG ((LM_DEBUG, "TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal %s\n", base->_tao_obv_repository_id () )); + retval = base->_tao_unmarshal_v (strm); + //%! ACE_DEBUG ((LM_DEBUG, "TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal retval unmarshal_v is %d\n", retval)); + if (!retval) return 0; + } + // Now base must be null or point to the unmarshaled object. + // Align the pointer to the right subobject. + new_object = ObjectReferenceTemplate::_downcast (base); + // %! unmarshal_post + return 1; +} + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceFactory::_tao_marshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_OutputCDR &strm){ + return _tao_marshal_state (strm); + +} +CORBA::Boolean OBV_TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_InputCDR &strm){ + return _tao_unmarshal_state (strm); + +} +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm){ + return _tao_marshal_state (strm); + +} +CORBA::Boolean OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &strm){ + return _tao_unmarshal_state (strm); + +} +TAO_PortableServer_Export void +operator<<= (CORBA::Any &any, TAO_Default_ORT::ObjectReferenceFactory *value) // copying +{ + TAO_OutputCDR stream; + if (stream << value) + { + any._tao_replace ( + TAO_Default_ORT::_tc_ObjectReferenceFactory, + TAO_ENCAP_BYTE_ORDER, + stream.begin ()); + } +} + +TAO_PortableServer_Export void +operator<<= (CORBA::Any &any, TAO_Default_ORT::ObjectReferenceFactory **value) // non-copying +{ + TAO_OutputCDR stream; + if (stream << *value) + { + any._tao_replace ( + TAO_Default_ORT::_tc_ObjectReferenceFactory, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + *value, + TAO_Default_ORT::ObjectReferenceFactory::_tao_any_destructor); + } +} + +TAO_PortableServer_Export CORBA::Boolean +operator>>= (const CORBA::Any &any, TAO_Default_ORT::ObjectReferenceFactory *&value) +{ + ACE_TRY_NEW_ENV + { + value = 0; + CORBA::TypeCode_var type = any.type (); + + CORBA::Boolean result = type->equivalent (TAO_Default_ORT::_tc_ObjectReferenceFactory ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (!result) + { + return 0; // not equivalent + } + if (any.any_owns_data ()) + { + const TAO_Default_ORT::ObjectReferenceFactory *const_holder = ACE_static_cast ( + const TAO_Default_ORT::ObjectReferenceFactory*, + any.value ()); + value = ACE_const_cast ( + TAO_Default_ORT::ObjectReferenceFactory*, + const_holder); + return 1; + } + else + { + TAO_Default_ORT::ObjectReferenceFactory *tmp; + TAO_InputCDR stream ( + any._tao_get_cdr (), + any._tao_byte_order ()); + if (stream >> tmp) + { + ((CORBA::Any *)&any)->_tao_replace ( + TAO_Default_ORT::_tc_ObjectReferenceFactory, + 1, + ACE_static_cast (void *, tmp), + TAO_Default_ORT::ObjectReferenceFactory::_tao_any_destructor); + value = tmp; + return 1; + } + + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceFactory, TAO_Default_ORT::ObjectReferenceFactory_var>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceFactory, TAO_Default_ORT::ObjectReferenceFactory_var> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +TAO_PortableServer_Export void +operator<<= (CORBA::Any &any, TAO_Default_ORT::ObjectReferenceTemplate *value) // copying +{ + TAO_OutputCDR stream; + if (stream << value) + { + any._tao_replace ( + TAO_Default_ORT::_tc_ObjectReferenceTemplate, + TAO_ENCAP_BYTE_ORDER, + stream.begin ()); + } +} + +TAO_PortableServer_Export void +operator<<= (CORBA::Any &any, TAO_Default_ORT::ObjectReferenceTemplate **value) // non-copying +{ + TAO_OutputCDR stream; + if (stream << *value) + { + any._tao_replace ( + TAO_Default_ORT::_tc_ObjectReferenceTemplate, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + *value, + TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor); + } +} + +TAO_PortableServer_Export CORBA::Boolean +operator>>= (const CORBA::Any &any, TAO_Default_ORT::ObjectReferenceTemplate *&value) +{ + ACE_TRY_NEW_ENV + { + value = 0; + CORBA::TypeCode_var type = any.type (); + + CORBA::Boolean result = type->equivalent (TAO_Default_ORT::_tc_ObjectReferenceTemplate ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (!result) + { + return 0; // not equivalent + } + if (any.any_owns_data ()) + { + const TAO_Default_ORT::ObjectReferenceTemplate *const_holder = ACE_static_cast ( + const TAO_Default_ORT::ObjectReferenceTemplate*, + any.value ()); + value = ACE_const_cast ( + TAO_Default_ORT::ObjectReferenceTemplate*, + const_holder); + return 1; + } + else + { + TAO_Default_ORT::ObjectReferenceTemplate *tmp; + TAO_InputCDR stream ( + any._tao_get_cdr (), + any._tao_byte_order ()); + if (stream >> tmp) + { + ((CORBA::Any *)&any)->_tao_replace ( + TAO_Default_ORT::_tc_ObjectReferenceTemplate, + 1, + ACE_static_cast (void *, tmp), + TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor); + value = tmp; + return 1; + } + + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +//@@ Boris: begin experimental +void +CORBA::add_ref (TAO_Default_ORT::ObjectReferenceFactory * vt) +{ + if (vt != 0) + { + vt->_add_ref (); + } +} + +void +CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceFactory * vt) +{ + if (vt != 0) + { + vt->_remove_ref (); + } +} + +//@@ Boris: end experimental +CORBA::Boolean +operator<< (TAO_OutputCDR &strm, const TAO_Default_ORT::ObjectReferenceFactory *_tao_valuetype) +{ + return CORBA_ValueBase::_tao_marshal (strm, + ACE_const_cast (TAO_Default_ORT::ObjectReferenceFactory*, _tao_valuetype), + (ptr_arith_t) &TAO_Default_ORT::ObjectReferenceFactory::_downcast); +} + +CORBA::Boolean +operator>> (TAO_InputCDR &strm, TAO_Default_ORT::ObjectReferenceFactory *&_tao_valuetype) +{ + return TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal (strm, _tao_valuetype); +} + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceFactory::_tao_marshal_state (TAO_OutputCDR &) +{ + if ( + 1 + ) + return 1; + else + return 0; + +} + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal_state (TAO_InputCDR &) +{ + if ( + 1 + ) + return 1; + else + return 0; + +} + +//@@ Boris: begin experimental +void +CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt) +{ + if (vt != 0) + { + vt->_add_ref (); + } +} + +void +CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt) +{ + if (vt != 0) + { + vt->_remove_ref (); + } +} + +//@@ Boris: end experimental +CORBA::Boolean +operator<< (TAO_OutputCDR &strm, const TAO_Default_ORT::ObjectReferenceTemplate *_tao_valuetype) +{ + return CORBA_ValueBase::_tao_marshal (strm, + ACE_const_cast (TAO_Default_ORT::ObjectReferenceTemplate*, _tao_valuetype), + (ptr_arith_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast); +} + +CORBA::Boolean +operator>> (TAO_InputCDR &strm, TAO_Default_ORT::ObjectReferenceTemplate *&_tao_valuetype) +{ + return TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype); +} + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &) +{ + if ( + 1 + ) + return 1; + else + return 0; + +} + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR &) +{ + if ( + 1 + ) + return 1; + else + return 0; + +} + diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h new file mode 100644 index 00000000000..ca599807bc8 --- /dev/null +++ b/TAO/tao/PortableServer/Default_ORTC.h @@ -0,0 +1,404 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_ +#define _TAO_IDL_ORIG_DEFAULT_ORTC_H_ + +#include "ace/pre.h" +#include "tao/corbafwd.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "portableserver_export.h" +#include "tao/ObjectReferenceTemplateC.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_PortableServer_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_PortableServer_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 */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +TAO_NAMESPACE TAO_Default_ORT +{ + // Valuetype class + class ObjectReferenceFactory; + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___PTR_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___PTR_CH_ + + typedef ObjectReferenceFactory *ObjectReferenceFactory_ptr; + +#endif /* end #if !defined */ + + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___VAR_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___VAR_CH_ + + class TAO_PortableServer_Export ObjectReferenceFactory_var + { + public: + ObjectReferenceFactory_var (void); // default constructor + ObjectReferenceFactory_var (ObjectReferenceFactory*); + ObjectReferenceFactory_var (const ObjectReferenceFactory*); // (TAO extension) + ObjectReferenceFactory_var (const ObjectReferenceFactory_var &); // copy constructor + ~ObjectReferenceFactory_var (void); // destructor + + ObjectReferenceFactory_var &operator= (ObjectReferenceFactory*); + ObjectReferenceFactory_var &operator= (const ObjectReferenceFactory_var &); + ObjectReferenceFactory* operator-> (void) const; + + operator const ObjectReferenceFactory* () const; + operator ObjectReferenceFactory* (); + // in, inout, out, _retn + ObjectReferenceFactory* in (void) const; + ObjectReferenceFactory* &inout (void); + ObjectReferenceFactory* &out (void); + ObjectReferenceFactory* _retn (void); + ObjectReferenceFactory* ptr (void) const; + + private: + ObjectReferenceFactory* ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___OUT_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___OUT_CH_ + + class TAO_PortableServer_Export ObjectReferenceFactory_out + { + public: + ObjectReferenceFactory_out (ObjectReferenceFactory* &); + ObjectReferenceFactory_out (ObjectReferenceFactory_var &); + ObjectReferenceFactory_out (const ObjectReferenceFactory_out &); + ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_out &); + ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_var &); + ObjectReferenceFactory_out &operator= (ObjectReferenceFactory*); + operator ObjectReferenceFactory* &(); + ObjectReferenceFactory* &ptr (void); + ObjectReferenceFactory* operator-> (void); + + private: + ObjectReferenceFactory* &ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY_CH_ + + class TAO_PortableServer_Export ObjectReferenceFactory + : public virtual PortableInterceptor::ObjectReferenceFactory + { + public: + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef ObjectReferenceFactory* _ptr_type; + typedef ObjectReferenceFactory_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + static ObjectReferenceFactory* _downcast (CORBA::ValueBase* ); + // The address of static _downcast is implicit used as type id + + // (TAO extensions or internals) + static CORBA::Boolean _tao_unmarshal ( + TAO_InputCDR &, + ObjectReferenceFactory *& + ); + virtual const char* _tao_obv_repository_id () const; + static const char* _tao_obv_static_repository_id (); + + static void _tao_any_destructor (void *); + + + protected: + ObjectReferenceFactory (); + virtual ~ObjectReferenceFactory (); + + // TAO internals + virtual void *_tao_obv_narrow (ptr_arith_t); + virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); + + private: + ObjectReferenceFactory (const ObjectReferenceFactory &); + void operator= (const ObjectReferenceFactory &); + + protected: + virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_OutputCDR &) = 0; + virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_InputCDR &) = 0; + + }; + +#endif /* end #if !defined */ + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory; + + // Valuetype class + class ObjectReferenceTemplate; + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___PTR_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___PTR_CH_ + + typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr; + +#endif /* end #if !defined */ + + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___VAR_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___VAR_CH_ + + class TAO_PortableServer_Export ObjectReferenceTemplate_var + { + public: + ObjectReferenceTemplate_var (void); // default constructor + ObjectReferenceTemplate_var (ObjectReferenceTemplate*); + ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension) + ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); // copy constructor + ~ObjectReferenceTemplate_var (void); // destructor + + ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*); + ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &); + ObjectReferenceTemplate* operator-> (void) const; + + operator const ObjectReferenceTemplate* () const; + operator ObjectReferenceTemplate* (); + // in, inout, out, _retn + ObjectReferenceTemplate* in (void) const; + ObjectReferenceTemplate* &inout (void); + ObjectReferenceTemplate* &out (void); + ObjectReferenceTemplate* _retn (void); + ObjectReferenceTemplate* ptr (void) const; + + private: + ObjectReferenceTemplate* ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OUT_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OUT_CH_ + + class TAO_PortableServer_Export ObjectReferenceTemplate_out + { + public: + ObjectReferenceTemplate_out (ObjectReferenceTemplate* &); + ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &); + ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &); + ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &); + ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &); + ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*); + operator ObjectReferenceTemplate* &(); + ObjectReferenceTemplate* &ptr (void); + ObjectReferenceTemplate* operator-> (void); + + private: + ObjectReferenceTemplate* &ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_ + + class TAO_PortableServer_Export ObjectReferenceTemplate + : public virtual PortableInterceptor::ObjectReferenceTemplate + { + public: + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef ObjectReferenceTemplate* _ptr_type; + typedef ObjectReferenceTemplate_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* ); + // The address of static _downcast is implicit used as type id + + // (TAO extensions or internals) + static CORBA::Boolean _tao_unmarshal ( + TAO_InputCDR &, + ObjectReferenceTemplate *& + ); + virtual const char* _tao_obv_repository_id () const; + static const char* _tao_obv_static_repository_id (); + + static void _tao_any_destructor (void *); + + + protected: + ObjectReferenceTemplate (); + virtual ~ObjectReferenceTemplate (); + + // TAO internals + virtual void *_tao_obv_narrow (ptr_arith_t); + virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); + + private: + ObjectReferenceTemplate (const ObjectReferenceTemplate &); + void operator= (const ObjectReferenceTemplate &); + + protected: + virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0; + virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0; + + }; + +#endif /* end #if !defined */ + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; + + +} +TAO_NAMESPACE_CLOSE // module TAO_Default_ORT + +TAO_NAMESPACE OBV_PortableInterceptor +{ +} +TAO_NAMESPACE_CLOSE + +TAO_NAMESPACE OBV_TAO_Default_ORT +{ + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___OBV_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___OBV_CH_ + + // OBV_ class + class TAO_PortableServer_Export ObjectReferenceFactory + : public virtual TAO_Default_ORT::ObjectReferenceFactory + { + public: + + protected: + virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_InputCDR &); + CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &); + CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &); + + private: + + }; + +#endif /* end #if !defined */ + + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_ + + // OBV_ class + class TAO_PortableServer_Export ObjectReferenceTemplate + : public virtual TAO_Default_ORT::ObjectReferenceTemplate + { + public: + + protected: + virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &); + CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &); + CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &); + + private: + + }; + +#endif /* end #if !defined */ + + } +TAO_NAMESPACE_CLOSE + +// Any operators for valuetype TAO_Default_ORT::ObjectReferenceFactory +TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceFactory *); // copying +TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceFactory **); // non-copying +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceFactory *&); +// Any operators for valuetype TAO_Default_ORT::ObjectReferenceTemplate +TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying +TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&); + +#ifndef __ACE_INLINE__ + +//@@ Boris: begin experimental +TAO_NAMESPACE CORBA +{ + void add_ref (TAO_Default_ORT::ObjectReferenceFactory *); + void remove_ref (TAO_Default_ORT::ObjectReferenceFactory *); +} +TAO_NAMESPACE_CLOSE +//@@ Boris: end experimental + +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceFactory *); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceFactory *&); +//@@ Boris: begin experimental +TAO_NAMESPACE CORBA +{ + void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *); + void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *); +} +TAO_NAMESPACE_CLOSE +//@@ Boris: end experimental + +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&); + +#endif /* __ACE_INLINE__ */ + + +#if defined (__ACE_INLINE__) +#include "Default_ORTC.i" +#endif /* defined INLINE */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#include "ace/post.h" +#endif /* ifndef */ diff --git a/TAO/tao/PortableServer/Default_ORTC.i b/TAO/tao/PortableServer/Default_ORTC.i new file mode 100644 index 00000000000..405dd309016 --- /dev/null +++ b/TAO/tao/PortableServer/Default_ORTC.i @@ -0,0 +1,71 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +ACE_INLINE +TAO_Default_ORT::ObjectReferenceFactory::ObjectReferenceFactory () // default constructor +{} + +ACE_INLINE +TAO_Default_ORT::ObjectReferenceFactory::~ObjectReferenceFactory () // destructor +{} + +ACE_INLINE const char* +TAO_Default_ORT::ObjectReferenceFactory::_tao_obv_static_repository_id () +{ + return "IDL:TAO_Default_ORT/ObjectReferenceFactory:1.0"; +} + +ACE_INLINE +TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate () // default constructor +{} + +ACE_INLINE +TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate () // destructor +{} + +ACE_INLINE const char* +TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id () +{ + return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0"; +} + +//@@ Boris: begin experimental +TAO_NAMESPACE CORBA +{ + void add_ref (TAO_Default_ORT::ObjectReferenceFactory *); + void remove_ref (TAO_Default_ORT::ObjectReferenceFactory *); +} +TAO_NAMESPACE_CLOSE +//@@ Boris: end experimental + +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceFactory *); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceFactory *&); +//@@ Boris: begin experimental +TAO_NAMESPACE CORBA +{ + void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *); + void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *); +} +TAO_NAMESPACE_CLOSE +//@@ Boris: end experimental + +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&); diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index 039d9c077a7..8a8c6ebb570 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -32,7 +32,7 @@ #endif /* TAO_HAS_INTERCEPTORS == 1 */ #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) @@ -41,8 +41,53 @@ int ImplementationRepository::ServerObject::_tao_class_id = 0; +ImplementationRepository::ServerObject_ptr +tao_ImplementationRepository_ServerObject_duplicate ( + ImplementationRepository::ServerObject_ptr p + ) +{ + return ImplementationRepository::ServerObject::_duplicate (p); +} + +void +tao_ImplementationRepository_ServerObject_release ( + ImplementationRepository::ServerObject_ptr p + ) +{ + CORBA::release (p); +} + +ImplementationRepository::ServerObject_ptr +tao_ImplementationRepository_ServerObject_nil ( + void + ) +{ + return ImplementationRepository::ServerObject::_nil (); +} + +ImplementationRepository::ServerObject_ptr +tao_ImplementationRepository_ServerObject_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_ImplementationRepository_ServerObject_upcast ( + void *src + ) +{ + ImplementationRepository::ServerObject **tmp = + ACE_static_cast (ImplementationRepository::ServerObject **, src); + return *tmp; +} + // ************************************************************* -// Operations for class ImplementationRepository::ServerObject_var +// ImplementationRepository::ServerObject_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* ImplementationRepository::ServerObject_var::ServerObject_var (void) // default constructor @@ -89,7 +134,7 @@ ImplementationRepository::ServerObject_var::operator const ::ImplementationRepos return this->ptr_; } -ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast +ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast { return this->ptr_; } @@ -163,8 +208,11 @@ ImplementationRepository::ServerObject_var::tao_upcast (void *src) ACE_static_cast (ServerObject **, src); return *tmp; } + // ************************************************************* -// Operations for class ImplementationRepository::ServerObject_out +// ImplementationRepository::ServerObject_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_ptr &p) @@ -229,36 +277,28 @@ class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping : public public: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &); void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &); - + }; TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} @@ -271,8 +311,9 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; + } Dynamic::ExceptionList * @@ -283,12 +324,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (AC Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -297,7 +337,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_EN CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -306,36 +346,28 @@ class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : pub public: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &); void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &); - + }; TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} @@ -348,8 +380,9 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; + } Dynamic::ExceptionList * @@ -360,12 +393,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -374,14 +406,14 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } #endif /* TAO_HAS_INTERCEPTORS */ /////////////////////////////////////////////////////////////////////// -// Base & Remote Proxy Implementation. +// Base & Remote Proxy Implementation. // ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void) @@ -400,15 +432,15 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( CORBA::SystemException )) { - - - - + + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "ping", @@ -416,129 +448,128 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( 0, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri ( + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping _tao_ri ( &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + _collocated_tao_target_ ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -552,15 +583,15 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( CORBA::SystemException )) { - - - - + + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "shutdown", @@ -568,129 +599,128 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( 0, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown _tao_ri ( &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + _collocated_tao_target_ ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -698,7 +728,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( // -// End Base & Remote Proxy Implemeentation. +// End Base & Remote Proxy Implemeentation. /////////////////////////////////////////////////////////////////////// @@ -749,13 +779,14 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy ( /////////////////////////////////////////////////////////////////////// -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + ImplementationRepository::ServerObject::ServerObject (int collocated) { this->ImplementationRepository_ServerObject_setup_collocation (collocated); } -// destructor ImplementationRepository::ServerObject::~ServerObject (void) {} @@ -785,7 +816,7 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec return ServerObject::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0"ACE_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ServerObject::_nil ()); if (is_a == 0) return ServerObject::_nil (); @@ -793,7 +824,8 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec return ServerObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_unchecked_narrow ( +ImplementationRepository::ServerObject_ptr +ImplementationRepository::ServerObject::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -824,7 +856,7 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec ServerObject::_nil () ); } - + if (CORBA::is_nil (default_proxy)) { ACE_NEW_RETURN ( @@ -837,10 +869,10 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec ServerObject::_nil () ); } - + return default_proxy; } - else + else return ACE_reinterpret_cast ( @@ -884,7 +916,7 @@ void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -896,36 +928,36 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo } void ImplementationRepository::ServerObject::ping ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - _TAO_ServerObject_Proxy_Impl &proxy = + _TAO_ServerObject_Proxy_Impl &proxy = this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.ping ( - this - ACE_ENV_ARG_PARAMETER + this ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::ServerObject::shutdown ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - _TAO_ServerObject_Proxy_Impl &proxy = + _TAO_ServerObject_Proxy_Impl &proxy = this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.shutdown ( - this - ACE_ENV_ARG_PARAMETER + this ACE_ENV_ARG_PARAMETER ); } @@ -933,22 +965,22 @@ static const CORBA::Long _oc_ImplementationRepository_ServerObject[] = { TAO_ENCAP_BYTE_ORDER, // byte order 46, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x7665724f), - ACE_NTOHL (0x626a6563), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x7665724f), + ACE_NTOHL (0x626a6563), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/ServerObject:1.0 13, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65724f62), - ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65724f62), + ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = ServerObject }; @@ -962,43 +994,43 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerObject ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerObject, &_tc_TAO_tc_ImplementationRepository_ServerObject) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerObject, &_tc_TAO_tc_ImplementationRepository_ServerObject) TAO_NAMESPACE_END static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] = { TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -1012,7 +1044,7 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentVariable ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnvironmentVariable, &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EnvironmentVariable, &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable) TAO_NAMESPACE_END void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_tao_void_pointer) @@ -1025,21 +1057,21 @@ static const CORBA::Long _oc_ImplementationRepository_Address[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -1053,7 +1085,7 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Address ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Address, &_tc_TAO_tc_ImplementationRepository_Address) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Address, &_tc_TAO_tc_ImplementationRepository_Address) TAO_NAMESPACE_END @@ -1067,17 +1099,17 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir { ImplementationRepository::EnvironmentVariable* tmp = 0; tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length); - + if (this->buffer_ != 0) { ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old); - + } this->buffer_ = tmp; } @@ -1087,12 +1119,12 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir { if (this->buffer_ == 0 || this->release_ == 0) return; - + ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_); - + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp); this->buffer_ = 0; -} +} ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor. { @@ -1103,7 +1135,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_ @@ -1115,30 +1147,30 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir ImplementationRepository::EnvironmentList::EnvironmentList (void) {} ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor @@ -1156,23 +1188,23 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1181,36 +1213,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -1227,44 +1259,44 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentList ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnvironmentList, &_tc_TAO_tc_ImplementationRepository_EnvironmentList) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EnvironmentList, &_tc_TAO_tc_ImplementationRepository_EnvironmentList) TAO_NAMESPACE_END static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START }; @@ -1278,63 +1310,63 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ActivationMode ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ActivationMode, &_tc_TAO_tc_ImplementationRepository_ActivationMode) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ActivationMode, &_tc_TAO_tc_ImplementationRepository_ActivationMode) TAO_NAMESPACE_END static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1343,88 +1375,88 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START }; @@ -1439,7 +1471,7 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_StartupOptions ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StartupOptions, &_tc_TAO_tc_ImplementationRepository_StartupOptions) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_StartupOptions, &_tc_TAO_tc_ImplementationRepository_StartupOptions) TAO_NAMESPACE_END void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_void_pointer) @@ -1452,95 +1484,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000), // name = ServerInformation 4, // member count 15, - ACE_NTOHL (0x6c6f6769), - ACE_NTOHL (0x63616c5f), - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6c6f6769), + ACE_NTOHL (0x63616c5f), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = logical_server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 7, - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 8, - ACE_NTOHL (0x73746172), + ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind 560, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1549,114 +1581,114 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START 9, - ACE_NTOHL (0x6c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x6c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = location CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -1671,7 +1703,7 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformation ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformation, &_tc_TAO_tc_ImplementationRepository_ServerInformation) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerInformation, &_tc_TAO_tc_ImplementationRepository_ServerInformation) TAO_NAMESPACE_END void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_tao_void_pointer) @@ -1691,17 +1723,17 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve { ImplementationRepository::ServerInformation* tmp = 0; tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length); - + if (this->buffer_ != 0) { ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old); - + } this->buffer_ = tmp; } @@ -1711,12 +1743,12 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve { if (this->buffer_ == 0 || this->release_ == 0) return; - + ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_); - + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp); this->buffer_ = 0; -} +} ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor. { @@ -1727,7 +1759,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_ @@ -1739,30 +1771,30 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve ImplementationRepository::ServerInformationList::ServerInformationList (void) {} ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor @@ -1780,26 +1812,26 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 55, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e4c69), - ACE_NTOHL (0x73743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e4c69), + ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0 22, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), - ACE_NTOHL (0x6e4c6973), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x6e4c6973), ACE_NTOHL (0x74000000), // name = ServerInformationList CORBA::tk_sequence, // typecode kind 828, // encapsulation length @@ -1808,95 +1840,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 812, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000), // name = ServerInformation 4, // member count 15, - ACE_NTOHL (0x6c6f6769), - ACE_NTOHL (0x63616c5f), - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6c6f6769), + ACE_NTOHL (0x63616c5f), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = logical_server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 7, - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 8, - ACE_NTOHL (0x73746172), + ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind 560, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1905,114 +1937,114 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START 9, - ACE_NTOHL (0x6c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x6c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = location CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -2030,13 +2062,58 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationList TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList) TAO_NAMESPACE_END int ImplementationRepository::Administration::_tao_class_id = 0; +ImplementationRepository::Administration_ptr +tao_ImplementationRepository_Administration_duplicate ( + ImplementationRepository::Administration_ptr p + ) +{ + return ImplementationRepository::Administration::_duplicate (p); +} + +void +tao_ImplementationRepository_Administration_release ( + ImplementationRepository::Administration_ptr p + ) +{ + CORBA::release (p); +} + +ImplementationRepository::Administration_ptr +tao_ImplementationRepository_Administration_nil ( + void + ) +{ + return ImplementationRepository::Administration::_nil (); +} + +ImplementationRepository::Administration_ptr +tao_ImplementationRepository_Administration_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_ImplementationRepository_Administration_upcast ( + void *src + ) +{ + ImplementationRepository::Administration **tmp = + ACE_static_cast (ImplementationRepository::Administration **, src); + return *tmp; +} + // ************************************************************* -// Operations for class ImplementationRepository::Administration_var +// ImplementationRepository::Administration_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* ImplementationRepository::Administration_var::Administration_var (void) // default constructor @@ -2083,7 +2160,7 @@ ImplementationRepository::Administration_var::operator const ::ImplementationRep return this->ptr_; } -ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast +ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast { return this->ptr_; } @@ -2157,8 +2234,11 @@ ImplementationRepository::Administration_var::tao_upcast (void *src) ACE_static_cast (Administration **, src); return *tmp; } + // ************************************************************* -// Operations for class ImplementationRepository::Administration_out +// ImplementationRepository::Administration_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* ImplementationRepository::Administration_out::Administration_out (Administration_ptr &p) @@ -2224,23 +2304,16 @@ public: TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -2248,14 +2321,13 @@ private: void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &); const char * server_; - + }; TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) @@ -2269,16 +2341,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::a Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2290,28 +2362,27 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::_tc_CannotActivate }; - + exception_list->length (2); for (CORBA::ULong i = 0; i < 2; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } return safe_exception_list._retn (); } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2320,7 +2391,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::r CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2331,23 +2402,16 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server, - const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -2356,15 +2420,14 @@ private: const char * server_; const ImplementationRepository::StartupOptions & options_; - + }; TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server, - const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_NOT_USED + const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2379,19 +2442,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::a Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (2); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; (*parameter_list)[len].argument <<= this->options_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2403,27 +2466,26 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = { ImplementationRepository::Administration::_tc_AlreadyRegistered }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } return safe_exception_list._retn (); } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2432,7 +2494,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::r CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2443,23 +2505,16 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server, - const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -2468,15 +2523,14 @@ private: const char * server_; const ImplementationRepository::StartupOptions & options_; - + }; TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server, - const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_NOT_USED + const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2491,19 +2545,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (2); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; (*parameter_list)[len].argument <<= this->options_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2515,12 +2569,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2529,7 +2582,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2539,23 +2592,16 @@ public: TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -2563,14 +2609,13 @@ private: void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &); const char * server_; - + }; TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) @@ -2584,16 +2629,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arg Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2605,27 +2650,26 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } return safe_exception_list._retn (); } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2634,7 +2678,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::res CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2644,23 +2688,16 @@ public: TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -2668,14 +2705,13 @@ private: void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &); const char * server_; - + }; TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) @@ -2689,16 +2725,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::a Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2710,27 +2746,26 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } return safe_exception_list._retn (); } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2739,7 +2774,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::r CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2751,23 +2786,16 @@ public: CORBA::Object_ptr _tao_target, const char * server, const char * addr, - ImplementationRepository::ServerObject_ptr server_object - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + ImplementationRepository::ServerObject_ptr server_object ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -2787,8 +2815,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Object_ptr _tao_target, const char * server, const char * addr, - ImplementationRepository::ServerObject_ptr server_object - ACE_ENV_ARG_DECL_NOT_USED + ImplementationRepository::ServerObject_ptr server_object ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2804,12 +2831,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (3); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -2819,7 +2846,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: (*parameter_list)[len].argument <<= this->server_object_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2831,27 +2858,26 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } return safe_exception_list._retn (); } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2860,17 +2886,17 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; return safe_result_any._retn (); } -void +void TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result) { - // update the result + // update the result this->_result = result; } @@ -2880,23 +2906,16 @@ public: TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -2904,14 +2923,13 @@ private: void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); const char * server_; - + }; TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) @@ -2925,16 +2943,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2946,27 +2964,26 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } return safe_exception_list._retn (); } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2975,7 +2992,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2985,23 +3002,16 @@ public: TAO_ClientRequestInfo_ImplementationRepository_Administration_find ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -3009,14 +3019,13 @@ private: void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &); const char * server_; - + }; TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRequestInfo_ImplementationRepository_Administration_find ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) @@ -3030,16 +3039,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -3051,27 +3060,26 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } return safe_exception_list._retn (); } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3080,7 +3088,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -3090,24 +3098,17 @@ public: TAO_ClientRequestInfo_ImplementationRepository_Administration_list ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::ULong & how_many - - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const CORBA::ULong & how_many + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -3115,16 +3116,15 @@ private: void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &); const CORBA::ULong & how_many_; - + }; TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::ULong & how_many - - ACE_ENV_ARG_DECL_NOT_USED + const CORBA::ULong & how_many + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), how_many_ (how_many) @@ -3139,16 +3139,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= how_many_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -3161,12 +3161,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3175,14 +3174,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } #endif /* TAO_HAS_INTERCEPTORS */ /////////////////////////////////////////////////////////////////////// -// Base & Remote Proxy Implementation. +// Base & Remote Proxy Implementation. // ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void) @@ -3199,13 +3198,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = { { "IDL:ImplementationRepository/Administration/NotFound:1.0", @@ -3217,14 +3216,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s } }; - - - + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "activate_server", @@ -3232,63 +3231,62 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s 1, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server _tao_ri ( &_tao_call, _collocated_tao_target_, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -3297,73 +3295,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL () ); - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -3376,12 +3374,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = { { "IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", @@ -3389,79 +3387,78 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s } }; - - - + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "register_server", 15, - 1, + 2, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server _tao_ri ( &_tao_call, _collocated_tao_target_, server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -3471,73 +3468,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL () ); - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -3553,80 +3550,79 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister CORBA::SystemException )) { - - - - + + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "reregister_server", 17, - 1, + 2, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server _tao_ri ( &_tao_call, _collocated_tao_target_, server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -3636,73 +3632,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL () ); - + _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -3714,12 +3710,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = { { "IDL:ImplementationRepository/Administration/NotFound:1.0", @@ -3727,14 +3723,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser } }; - - - + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "remove_server", @@ -3742,63 +3738,62 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser 1, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server _tao_ri ( &_tao_call, _collocated_tao_target_, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -3807,73 +3802,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL () ); - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -3885,12 +3880,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = { { "IDL:ImplementationRepository/Administration/NotFound:1.0", @@ -3898,14 +3893,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s } }; - - - + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "shutdown_server", @@ -3913,63 +3908,62 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s 1, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server _tao_ri ( &_tao_call, _collocated_tao_target_, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -3978,73 +3972,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL () ); - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -4058,12 +4052,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = { { "IDL:ImplementationRepository/Administration/NotFound:1.0", @@ -4071,80 +4065,79 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i } }; - CORBA::String_var _tao_safe_retval; - - + CORBA::String_var _tao_retval; + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), 0); - + ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ()); + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "server_is_running", 17, - 1, + 3, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running _tao_ri ( &_tao_call, _collocated_tao_target_, server, addr, - server_object - ACE_ENV_ARG_PARAMETER + server_object ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (_tao_retval._retn ()); #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -4156,10 +4149,10 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i CORBA::MARSHAL (), 0 ); - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (0); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); if (_invoke_status == TAO_INVOKE_EXCEPTION) { @@ -4167,80 +4160,80 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES), 0 ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( - (_tao_in >> _tao_safe_retval.inout ()) + (_tao_in >> _tao_retval.inout ()) )) { TAO_INTERCEPTOR_THROW_RETURN ( CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0 ); - + } - + #if TAO_HAS_INTERCEPTORS == 1 - char * _tao_retval_info = _tao_safe_retval._retn (); - ri.result (_tao_retval_info); - _tao_safe_retval = _tao_retval_info; - - ri.reply_status (_invoke_status); + char * _tao_retval_info = _tao_retval._retn (); + _tao_ri.result (_tao_retval_info); + _tao_retval = _tao_retval_info; + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (_tao_retval._retn ()); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval._retn ()); if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } -return _tao_safe_retval._retn (); +return _tao_retval._retn (); } void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down ( @@ -4249,12 +4242,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = { { "IDL:ImplementationRepository/Administration/NotFound:1.0", @@ -4262,14 +4255,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ } }; - - - + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "server_is_shutting_down", @@ -4277,63 +4270,62 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ 1, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down _tao_ri ( &_tao_call, _collocated_tao_target_, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( @@ -4342,73 +4334,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL () ); - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -4421,12 +4413,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = { { "IDL:ImplementationRepository/Administration/NotFound:1.0", @@ -4434,19 +4426,19 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( } }; - - - + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + ACE_NEW ( info.ptr (), ImplementationRepository::ServerInformation ); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "find", @@ -4454,97 +4446,96 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( 1, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_find ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_find _tao_ri ( &_tao_call, _collocated_tao_target_, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( - (_tao_out << server) + (_tao_out << server) )) TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL () ); - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( (_tao_in >> *info.ptr ()) @@ -4553,49 +4544,49 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) ); - + } - + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -4612,20 +4603,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( CORBA::SystemException )) { - - - - + + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + ACE_NEW ( server_list.ptr (), ImplementationRepository::ServerInformationList ); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "list", @@ -4633,98 +4624,97 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( 1, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_Administration_list ri ( + TAO_ClientRequestInfo_ImplementationRepository_Administration_list _tao_ri ( &_tao_call, _collocated_tao_target_, - how_many - - ACE_ENV_ARG_PARAMETER + how_many + ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( - (_tao_out << how_many) + (_tao_out << how_many) )) TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL () ); - + _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( (_tao_in >> *server_list.ptr ()) && @@ -4734,49 +4724,49 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) ); - + } - + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -4784,7 +4774,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( // -// End Base & Remote Proxy Implemeentation. +// End Base & Remote Proxy Implemeentation. /////////////////////////////////////////////////////////////////////// @@ -4835,13 +4825,14 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy /////////////////////////////////////////////////////////////////////// -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + ImplementationRepository::Administration::Administration (int collocated) { this->ImplementationRepository_Administration_setup_collocation (collocated); } -// destructor ImplementationRepository::Administration::~Administration (void) {} @@ -4871,7 +4862,7 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr return Administration::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0"ACE_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Administration::_nil ()); if (is_a == 0) return Administration::_nil (); @@ -4879,7 +4870,8 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr return Administration::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_unchecked_narrow ( +ImplementationRepository::Administration_ptr +ImplementationRepository::Administration::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -4910,7 +4902,7 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr Administration::_nil () ); } - + if (CORBA::is_nil (default_proxy)) { ACE_NEW_RETURN ( @@ -4923,10 +4915,10 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr Administration::_nil () ); } - + return default_proxy; } - else + else return ACE_reinterpret_cast ( @@ -4970,7 +4962,7 @@ void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -4992,12 +4984,6 @@ ImplementationRepository::Administration::AlreadyRegistered::~AlreadyRegistered { } -void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor (void *_tao_void_pointer) -{ - AlreadyRegistered *tmp = ACE_static_cast (AlreadyRegistered*, _tao_void_pointer); - delete tmp; -} - // Copy constructor. ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::Administration::AlreadyRegistered &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -5012,7 +4998,12 @@ ImplementationRepository::Administration::AlreadyRegistered::operator= (const :: return *this; } -// Narrow. +void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor (void *_tao_void_pointer) +{ + AlreadyRegistered *tmp = ACE_static_cast (AlreadyRegistered*, _tao_void_pointer); + delete tmp; +} + ImplementationRepository::Administration::AlreadyRegistered * ImplementationRepository::Administration::AlreadyRegistered::_downcast (CORBA::Exception *exc) { @@ -5026,6 +5017,25 @@ ImplementationRepository::Administration::AlreadyRegistered::_downcast (CORBA::E } } +CORBA::Exception *ImplementationRepository::Administration::AlreadyRegistered::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::AlreadyRegistered, 0); + return retval; +} + +CORBA::Exception * +ImplementationRepository::Administration::AlreadyRegistered::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + ImplementationRepository::Administration::AlreadyRegistered (*this), + 0 + ); + return result; +} + void ImplementationRepository::Administration::AlreadyRegistered::_raise () { TAO_RAISE (*this); @@ -5040,7 +5050,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -5053,44 +5063,36 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *ImplementationRepository::Administration::AlreadyRegistered::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::AlreadyRegistered, 0); - return retval; -} - static const CORBA::Long _oc_ImplementationRepository_Administration_AlreadyRegistered[] = { TAO_ENCAP_BYTE_ORDER, // byte order 66, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f41646d), - ACE_NTOHL (0x696e6973), - ACE_NTOHL (0x74726174), - ACE_NTOHL (0x696f6e2f), - ACE_NTOHL (0x416c7265), - ACE_NTOHL (0x61647952), - ACE_NTOHL (0x65676973), - ACE_NTOHL (0x74657265), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f41646d), + ACE_NTOHL (0x696e6973), + ACE_NTOHL (0x74726174), + ACE_NTOHL (0x696f6e2f), + ACE_NTOHL (0x416c7265), + ACE_NTOHL (0x61647952), + ACE_NTOHL (0x65676973), + ACE_NTOHL (0x74657265), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0 18, - ACE_NTOHL (0x416c7265), - ACE_NTOHL (0x61647952), - ACE_NTOHL (0x65676973), - ACE_NTOHL (0x74657265), + ACE_NTOHL (0x416c7265), + ACE_NTOHL (0x61647952), + ACE_NTOHL (0x65676973), + ACE_NTOHL (0x74657265), ACE_NTOHL (0x64000000), // name = AlreadyRegistered 0, // member count }; @@ -5103,7 +5105,7 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_Alread sizeof (ImplementationRepository::Administration::AlreadyRegistered) ); -CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_AlreadyRegistered = +::CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_AlreadyRegistered = &_tc_TAO_tc_ImplementationRepository_Administration_AlreadyRegistered; @@ -5124,12 +5126,6 @@ ImplementationRepository::Administration::CannotActivate::~CannotActivate (void) { } -void ImplementationRepository::Administration::CannotActivate::_tao_any_destructor (void *_tao_void_pointer) -{ - CannotActivate *tmp = ACE_static_cast (CannotActivate*, _tao_void_pointer); - delete tmp; -} - // Copy constructor. ImplementationRepository::Administration::CannotActivate::CannotActivate (const ::ImplementationRepository::Administration::CannotActivate &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -5146,7 +5142,12 @@ ImplementationRepository::Administration::CannotActivate::operator= (const ::Imp return *this; } -// Narrow. +void ImplementationRepository::Administration::CannotActivate::_tao_any_destructor (void *_tao_void_pointer) +{ + CannotActivate *tmp = ACE_static_cast (CannotActivate*, _tao_void_pointer); + delete tmp; +} + ImplementationRepository::Administration::CannotActivate * ImplementationRepository::Administration::CannotActivate::_downcast (CORBA::Exception *exc) { @@ -5160,6 +5161,25 @@ ImplementationRepository::Administration::CannotActivate::_downcast (CORBA::Exce } } +CORBA::Exception *ImplementationRepository::Administration::CannotActivate::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::CannotActivate, 0); + return retval; +} + +CORBA::Exception * +ImplementationRepository::Administration::CannotActivate::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + ImplementationRepository::Administration::CannotActivate (*this), + 0 + ); + return result; +} + void ImplementationRepository::Administration::CannotActivate::_raise () { TAO_RAISE (*this); @@ -5174,7 +5194,7 @@ void ImplementationRepository::Administration::CannotActivate::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -5187,18 +5207,10 @@ void ImplementationRepository::Administration::CannotActivate::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *ImplementationRepository::Administration::CannotActivate::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::CannotActivate, 0); - return retval; -} - ImplementationRepository::Administration::CannotActivate::CannotActivate ( const char * _tao_reason ) @@ -5211,32 +5223,32 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_CannotActiv { TAO_ENCAP_BYTE_ORDER, // byte order 63, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f41646d), - ACE_NTOHL (0x696e6973), - ACE_NTOHL (0x74726174), - ACE_NTOHL (0x696f6e2f), - ACE_NTOHL (0x43616e6e), - ACE_NTOHL (0x6f744163), - ACE_NTOHL (0x74697661), - ACE_NTOHL (0x74653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f41646d), + ACE_NTOHL (0x696e6973), + ACE_NTOHL (0x74726174), + ACE_NTOHL (0x696f6e2f), + ACE_NTOHL (0x43616e6e), + ACE_NTOHL (0x6f744163), + ACE_NTOHL (0x74697661), + ACE_NTOHL (0x74653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/Administration/CannotActivate:1.0 15, - ACE_NTOHL (0x43616e6e), - ACE_NTOHL (0x6f744163), - ACE_NTOHL (0x74697661), + ACE_NTOHL (0x43616e6e), + ACE_NTOHL (0x6f744163), + ACE_NTOHL (0x74697661), ACE_NTOHL (0x74650000), // name = CannotActivate 1, // member count 7, - ACE_NTOHL (0x72656173), + ACE_NTOHL (0x72656173), ACE_NTOHL (0x6f6e0000), // name = reason - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -5248,7 +5260,7 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_Cannot sizeof (ImplementationRepository::Administration::CannotActivate) ); -CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_CannotActivate = +::CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_CannotActivate = &_tc_TAO_tc_ImplementationRepository_Administration_CannotActivate; @@ -5269,12 +5281,6 @@ ImplementationRepository::Administration::NotFound::~NotFound (void) { } -void ImplementationRepository::Administration::NotFound::_tao_any_destructor (void *_tao_void_pointer) -{ - NotFound *tmp = ACE_static_cast (NotFound*, _tao_void_pointer); - delete tmp; -} - // Copy constructor. ImplementationRepository::Administration::NotFound::NotFound (const ::ImplementationRepository::Administration::NotFound &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -5289,7 +5295,12 @@ ImplementationRepository::Administration::NotFound::operator= (const ::Implement return *this; } -// Narrow. +void ImplementationRepository::Administration::NotFound::_tao_any_destructor (void *_tao_void_pointer) +{ + NotFound *tmp = ACE_static_cast (NotFound*, _tao_void_pointer); + delete tmp; +} + ImplementationRepository::Administration::NotFound * ImplementationRepository::Administration::NotFound::_downcast (CORBA::Exception *exc) { @@ -5303,6 +5314,25 @@ ImplementationRepository::Administration::NotFound::_downcast (CORBA::Exception } } +CORBA::Exception *ImplementationRepository::Administration::NotFound::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::NotFound, 0); + return retval; +} + +CORBA::Exception * +ImplementationRepository::Administration::NotFound::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + ImplementationRepository::Administration::NotFound (*this), + 0 + ); + return result; +} + void ImplementationRepository::Administration::NotFound::_raise () { TAO_RAISE (*this); @@ -5317,7 +5347,7 @@ void ImplementationRepository::Administration::NotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -5330,40 +5360,32 @@ void ImplementationRepository::Administration::NotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *ImplementationRepository::Administration::NotFound::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::NotFound, 0); - return retval; -} - static const CORBA::Long _oc_ImplementationRepository_Administration_NotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order 57, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f41646d), - ACE_NTOHL (0x696e6973), - ACE_NTOHL (0x74726174), - ACE_NTOHL (0x696f6e2f), - ACE_NTOHL (0x4e6f7446), - ACE_NTOHL (0x6f756e64), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f41646d), + ACE_NTOHL (0x696e6973), + ACE_NTOHL (0x74726174), + ACE_NTOHL (0x696f6e2f), + ACE_NTOHL (0x4e6f7446), + ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Administration/NotFound:1.0 9, - ACE_NTOHL (0x4e6f7446), - ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x4e6f7446), + ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0), // name = NotFound 0, // member count }; @@ -5376,7 +5398,7 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_NotFou sizeof (ImplementationRepository::Administration::NotFound) ); -CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_NotFound = +::CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_NotFound = &_tc_TAO_tc_ImplementationRepository_Administration_NotFound; @@ -5391,19 +5413,18 @@ void ImplementationRepository::Administration::activate_server ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.activate_server ( this, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); } @@ -5413,19 +5434,18 @@ void ImplementationRepository::Administration::register_server ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.register_server ( this, server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); } @@ -5438,15 +5458,14 @@ void ImplementationRepository::Administration::reregister_server ( CORBA::SystemException )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.reregister_server ( this, server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); } @@ -5455,18 +5474,17 @@ void ImplementationRepository::Administration::remove_server ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.remove_server ( this, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); } @@ -5475,18 +5493,17 @@ void ImplementationRepository::Administration::shutdown_server ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.shutdown_server ( this, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); } @@ -5497,20 +5514,19 @@ char * ImplementationRepository::Administration::server_is_running ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return proxy.server_is_running ( this, server, addr, - server_object - ACE_ENV_ARG_PARAMETER + server_object ACE_ENV_ARG_PARAMETER ); } @@ -5519,18 +5535,17 @@ void ImplementationRepository::Administration::server_is_shutting_down ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.server_is_shutting_down ( this, - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); } @@ -5540,19 +5555,18 @@ void ImplementationRepository::Administration::find ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.find ( this, server, - info - ACE_ENV_ARG_PARAMETER + info ACE_ENV_ARG_PARAMETER ); } @@ -5566,16 +5580,15 @@ void ImplementationRepository::Administration::list ( CORBA::SystemException )) { - _TAO_Administration_Proxy_Impl &proxy = + _TAO_Administration_Proxy_Impl &proxy = this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.list ( this, how_many, server_list, - server_iterator - ACE_ENV_ARG_PARAMETER + server_iterator ACE_ENV_ARG_PARAMETER ); } @@ -5583,22 +5596,22 @@ static const CORBA::Long _oc_ImplementationRepository_Administration[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f41646d), - ACE_NTOHL (0x696e6973), - ACE_NTOHL (0x74726174), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f41646d), + ACE_NTOHL (0x696e6973), + ACE_NTOHL (0x74726174), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/Administration:1.0 15, - ACE_NTOHL (0x41646d69), - ACE_NTOHL (0x6e697374), - ACE_NTOHL (0x72617469), + ACE_NTOHL (0x41646d69), + ACE_NTOHL (0x6e697374), + ACE_NTOHL (0x72617469), ACE_NTOHL (0x6f6e0000), // name = Administration }; @@ -5612,13 +5625,58 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration) TAO_NAMESPACE_END int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0; +ImplementationRepository::ServerInformationIterator_ptr +tao_ImplementationRepository_ServerInformationIterator_duplicate ( + ImplementationRepository::ServerInformationIterator_ptr p + ) +{ + return ImplementationRepository::ServerInformationIterator::_duplicate (p); +} + +void +tao_ImplementationRepository_ServerInformationIterator_release ( + ImplementationRepository::ServerInformationIterator_ptr p + ) +{ + CORBA::release (p); +} + +ImplementationRepository::ServerInformationIterator_ptr +tao_ImplementationRepository_ServerInformationIterator_nil ( + void + ) +{ + return ImplementationRepository::ServerInformationIterator::_nil (); +} + +ImplementationRepository::ServerInformationIterator_ptr +tao_ImplementationRepository_ServerInformationIterator_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_ImplementationRepository_ServerInformationIterator_upcast ( + void *src + ) +{ + ImplementationRepository::ServerInformationIterator **tmp = + ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src); + return *tmp; +} + // ************************************************************* -// Operations for class ImplementationRepository::ServerInformationIterator_var +// ImplementationRepository::ServerInformationIterator_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (void) // default constructor @@ -5665,7 +5723,7 @@ ImplementationRepository::ServerInformationIterator_var::operator const ::Implem return this->ptr_; } -ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast +ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast { return this->ptr_; } @@ -5739,8 +5797,11 @@ ImplementationRepository::ServerInformationIterator_var::tao_upcast (void *src) ACE_static_cast (ServerInformationIterator **, src); return *tmp; } + // ************************************************************* -// Operations for class ImplementationRepository::ServerInformationIterator_out +// ImplementationRepository::ServerInformationIterator_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_ptr &p) @@ -5806,23 +5867,16 @@ public: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::ULong & how_many - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + const CORBA::ULong & how_many ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -5838,8 +5892,7 @@ private: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::ULong & how_many - ACE_ENV_ARG_DECL_NOT_USED + const CORBA::ULong & how_many ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), how_many_ (how_many) @@ -5853,16 +5906,16 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= how_many_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5874,12 +5927,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5888,17 +5940,17 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); return safe_result_any._retn (); } -void +void TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result) { - // update the result + // update the result this->_result = result; } @@ -5907,36 +5959,28 @@ class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_d public: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL); - - - virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL) - + + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); - + }; TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED + CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} @@ -5949,8 +5993,9 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; + } Dynamic::ExceptionList * @@ -5961,12 +6006,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } - -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5975,14 +6019,14 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } #endif /* TAO_HAS_INTERCEPTORS */ /////////////////////////////////////////////////////////////////////// -// Base & Remote Proxy Implementation. +// Base & Remote Proxy Implementation. // ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void) @@ -6003,21 +6047,21 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P CORBA::SystemException )) { - + CORBA::Boolean _tao_retval = 0; - - + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - + ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval); + ACE_NEW_RETURN ( server_list.ptr (), ImplementationRepository::ServerInformationList, 0 ); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "next_n", @@ -6025,76 +6069,75 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P 1, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri ( + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n _tao_ri ( &_tao_call, _collocated_tao_target_, - how_many - ACE_ENV_ARG_PARAMETER + how_many ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (_tao_retval); + ACE_CHECK_RETURN (_tao_retval); #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( - (_tao_out << how_many) + (_tao_out << how_many) )) TAO_INTERCEPTOR_THROW_RETURN ( CORBA::MARSHAL (), _tao_retval ); - + _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) { @@ -6102,22 +6145,22 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES), _tao_retval ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) && @@ -6128,51 +6171,51 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval ); - + } - + #if TAO_HAS_INTERCEPTORS == 1 CORBA::Boolean _tao_retval_info = _tao_retval; - ri.result (_tao_retval_info); - - ri.reply_status (_invoke_status); + _tao_ri.result (_tao_retval_info); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval); + ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } return _tao_retval; @@ -6186,15 +6229,15 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: CORBA::SystemException )) { - - - - + + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "destroy", @@ -6202,129 +6245,128 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: 0, istub->orb_core () ); - + int _invoke_status; - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr ( istub->orb_core ()->client_request_interceptors (), &_tao_call, _invoke_status ); - + #endif /* TAO_HAS_INTERCEPTORS */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy _tao_ri ( &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + _collocated_tao_target_ ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; + ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - - + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (ri.response_expected (1)); - + TAO_INTERCEPTOR (_tao_ri.response_expected (1)); + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER ); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) { TAO_INTERCEPTOR_THROW ( CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) ); - + } else if (_invoke_status == TAO_INVOKE_RESTART) { TAO_INTERCEPTOR ( - ri.reply_status (_invoke_status); + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) - + continue; } - - + + #if TAO_HAS_INTERCEPTORS == 1 - - ri.reply_status (_invoke_status); + + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) continue; - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } @@ -6332,7 +6374,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: // -// End Base & Remote Proxy Implemeentation. +// End Base & Remote Proxy Implemeentation. /////////////////////////////////////////////////////////////////////// @@ -6383,13 +6425,14 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::se /////////////////////////////////////////////////////////////////////// -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + ImplementationRepository::ServerInformationIterator::ServerInformationIterator (int collocated) { this->ImplementationRepository_ServerInformationIterator_setup_collocation (collocated); } -// destructor ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void) {} @@ -6419,7 +6462,7 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository return ServerInformationIterator::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0"ACE_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ServerInformationIterator::_nil ()); if (is_a == 0) return ServerInformationIterator::_nil (); @@ -6427,7 +6470,8 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository return ServerInformationIterator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( +ImplementationRepository::ServerInformationIterator_ptr +ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -6458,7 +6502,7 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository ServerInformationIterator::_nil () ); } - + if (CORBA::is_nil (default_proxy)) { ACE_NEW_RETURN ( @@ -6471,10 +6515,10 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository ServerInformationIterator::_nil () ); } - + return default_proxy; } - else + else return ACE_reinterpret_cast ( @@ -6518,7 +6562,7 @@ void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface ( else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -6538,32 +6582,31 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( CORBA::SystemException )) { - _TAO_ServerInformationIterator_Proxy_Impl &proxy = + _TAO_ServerInformationIterator_Proxy_Impl &proxy = this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return proxy.next_n ( this, how_many, - server_list - ACE_ENV_ARG_PARAMETER + server_list ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::ServerInformationIterator::destroy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - _TAO_ServerInformationIterator_Proxy_Impl &proxy = + _TAO_ServerInformationIterator_Proxy_Impl &proxy = this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.destroy ( - this - ACE_ENV_ARG_PARAMETER + this ACE_ENV_ARG_PARAMETER ); } @@ -6571,28 +6614,28 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[ { TAO_ENCAP_BYTE_ORDER, // byte order 59, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e4974), - ACE_NTOHL (0x65726174), - ACE_NTOHL (0x6f723a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e4974), + ACE_NTOHL (0x65726174), + ACE_NTOHL (0x6f723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0 26, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), - ACE_NTOHL (0x6e497465), - ACE_NTOHL (0x7261746f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x6e497465), + ACE_NTOHL (0x7261746f), ACE_NTOHL (0x72000000), // name = ServerInformationIterator }; @@ -6606,7 +6649,7 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationIter TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformationIterator, &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerInformationIterator, &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator) TAO_NAMESPACE_END void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerObject_ptr _tao_elem) @@ -6615,7 +6658,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerObject_p if (stream << _tao_elem) { _tao_any._tao_replace ( - ImplementationRepository::_tc_ServerObject, + ImplementationRepository::_tc_ServerObject, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, @@ -6631,13 +6674,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::ServerObject::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -6706,13 +6749,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -6797,13 +6840,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -6860,13 +6903,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -6920,13 +6963,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -7003,13 +7046,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -7094,13 +7137,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -7147,7 +7190,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration if (stream << _tao_elem) { _tao_any._tao_replace ( - ImplementationRepository::_tc_Administration, + ImplementationRepository::_tc_Administration, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, @@ -7163,13 +7206,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::Administration::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -7241,13 +7284,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value (); @@ -7331,13 +7374,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value (); @@ -7421,13 +7464,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value (); @@ -7478,7 +7521,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformat if (stream << _tao_elem) { _tao_any._tao_replace ( - ImplementationRepository::_tc_ServerInformationIterator, + ImplementationRepository::_tc_ServerInformationIterator, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, @@ -7494,13 +7537,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::ServerInformationIterator::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -7598,8 +7641,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) @@ -7640,8 +7688,13 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index 19239e80f9b..d8ed0a2755c 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -29,14 +29,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/CDR.h" -#include "tao/Any.h" +#include "portableserver_export.h" + +#include "tao/Exception.h" #include "tao/Object.h" -#include "tao/ClientRequestInfo.h" -#include "tao/Remote_Object_Proxy_Impl.h" -#include "tao/Managed_Types.h" #include "tao/Sequence.h" -#include "portableserver_export.h" +#include "tao/Remote_Object_Proxy_Impl.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -168,13 +166,13 @@ TAO_NAMESPACE ImplementationRepository static ServerObject_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerObject_ptr _nil (void) { @@ -184,23 +182,25 @@ TAO_NAMESPACE ImplementationRepository static void _tao_any_destructor (void*); virtual void ping ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void shutdown ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -212,7 +212,7 @@ TAO_NAMESPACE ImplementationRepository protected: ServerObject (int collocated = 0); - // This methods travese the inheritance tree and set the + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated); @@ -371,7 +371,7 @@ TAO_NAMESPACE ImplementationRepository #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject; struct EnvironmentVariable; class EnvironmentVariable_var; @@ -438,12 +438,12 @@ TAO_NAMESPACE ImplementationRepository void operator= (const EnvironmentVariable_var &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentVariable; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable; typedef char * Address; typedef CORBA::String_var Address_var; typedef CORBA::String_out Address_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -606,7 +606,7 @@ TAO_NAMESPACE ImplementationRepository #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList; enum ActivationMode { @@ -617,7 +617,7 @@ TAO_NAMESPACE ImplementationRepository }; typedef ActivationMode &ActivationMode_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode; struct StartupOptions; class StartupOptions_var; @@ -686,7 +686,7 @@ TAO_NAMESPACE ImplementationRepository void operator= (const StartupOptions_var &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StartupOptions; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions; struct ServerInformation; class ServerInformation_var; @@ -755,7 +755,7 @@ TAO_NAMESPACE ImplementationRepository void operator= (const ServerInformation_var &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -918,7 +918,7 @@ TAO_NAMESPACE ImplementationRepository #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList; class ServerInformationIterator; @@ -1104,13 +1104,13 @@ TAO_NAMESPACE ImplementationRepository static Administration_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Administration_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Administration_ptr _nil (void) { @@ -1128,17 +1128,17 @@ TAO_NAMESPACE ImplementationRepository public: AlreadyRegistered (void); - // Default constructor. - AlreadyRegistered (const AlreadyRegistered &); - // Copy constructor. - ~AlreadyRegistered (void); - // Destructor. + + AlreadyRegistered &operator= (const AlreadyRegistered &); static void _tao_any_destructor (void*); - AlreadyRegistered &operator= (const AlreadyRegistered &); + static AlreadyRegistered *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -1152,15 +1152,11 @@ TAO_NAMESPACE ImplementationRepository ACE_ENV_ARG_DECL_NOT_USED ); - static AlreadyRegistered *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception ImplementationRepository::Administration::AlreadyRegistered. + }; -static CORBA::TypeCode_ptr _tc_AlreadyRegistered; +static ::CORBA::TypeCode_ptr _tc_AlreadyRegistered; #endif /* end #if !defined */ @@ -1175,17 +1171,17 @@ static CORBA::TypeCode_ptr _tc_AlreadyRegistered; TAO_String_Manager reason; CannotActivate (void); - // Default constructor. - CannotActivate (const CannotActivate &); - // Copy constructor. - ~CannotActivate (void); - // Destructor. + + CannotActivate &operator= (const CannotActivate &); static void _tao_any_destructor (void*); - CannotActivate &operator= (const CannotActivate &); + static CannotActivate *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -1199,18 +1195,14 @@ static CORBA::TypeCode_ptr _tc_AlreadyRegistered; ACE_ENV_ARG_DECL_NOT_USED ); - static CannotActivate *_downcast (CORBA::Exception *); - - CannotActivate ( + CannotActivate ( const char * _tao_reason ); - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception ImplementationRepository::Administration::CannotActivate. + }; -static CORBA::TypeCode_ptr _tc_CannotActivate; +static ::CORBA::TypeCode_ptr _tc_CannotActivate; #endif /* end #if !defined */ @@ -1224,17 +1216,17 @@ static CORBA::TypeCode_ptr _tc_CannotActivate; public: NotFound (void); - // Default constructor. - NotFound (const NotFound &); - // Copy constructor. - ~NotFound (void); - // Destructor. + + NotFound &operator= (const NotFound &); static void _tao_any_destructor (void*); - NotFound &operator= (const NotFound &); + static NotFound *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -1248,110 +1240,106 @@ static CORBA::TypeCode_ptr _tc_CannotActivate; ACE_ENV_ARG_DECL_NOT_USED ); - static NotFound *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception ImplementationRepository::Administration::NotFound. + }; -static CORBA::TypeCode_ptr _tc_NotFound; +static ::CORBA::TypeCode_ptr _tc_NotFound; #endif /* end #if !defined */ virtual void activate_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )); virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )); virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual void shutdown_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual char * server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual void server_is_shutting_down ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual void list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1363,7 +1351,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; protected: Administration (int collocated = 0); - // This methods travese the inheritance tree and set the + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode virtual void ImplementationRepository_Administration_setup_collocation (int collocated); @@ -1404,9 +1392,9 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )) = 0; virtual void register_server ( @@ -1416,8 +1404,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )) = 0; virtual void reregister_server ( @@ -1436,8 +1424,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; virtual void shutdown_server ( @@ -1446,8 +1434,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; virtual char * server_is_running ( @@ -1458,8 +1446,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; virtual void server_is_shutting_down ( @@ -1468,8 +1456,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; virtual void find ( @@ -1479,8 +1467,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; virtual void list ( @@ -1522,9 +1510,9 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )); virtual void register_server ( @@ -1534,8 +1522,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )); virtual void reregister_server ( @@ -1554,8 +1542,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual void shutdown_server ( @@ -1564,8 +1552,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual char * server_is_running ( @@ -1576,8 +1564,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual void server_is_shutting_down ( @@ -1586,8 +1574,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual void find ( @@ -1597,8 +1585,8 @@ static CORBA::TypeCode_ptr _tc_NotFound; ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); virtual void list ( @@ -1682,7 +1670,86 @@ static CORBA::TypeCode_ptr _tc_NotFound; #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Administration; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration; + + +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_) +#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_ + + class ServerInformationIterator; + typedef ServerInformationIterator *ServerInformationIterator_ptr; + +#endif /* end #if !defined */ + + +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_) +#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_ + + class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var + { + public: + ServerInformationIterator_var (void); // default constructor + ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} + ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor + ~ServerInformationIterator_var (void); // destructor + + ServerInformationIterator_var &operator= (ServerInformationIterator_ptr); + ServerInformationIterator_var &operator= (const ServerInformationIterator_var &); + ServerInformationIterator_ptr operator-> (void) const; + + operator const ServerInformationIterator_ptr &() const; + operator ServerInformationIterator_ptr &(); + // in, inout, out, _retn + ServerInformationIterator_ptr in (void) const; + ServerInformationIterator_ptr &inout (void); + ServerInformationIterator_ptr &out (void); + ServerInformationIterator_ptr _retn (void); + ServerInformationIterator_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static ServerInformationIterator_ptr tao_duplicate (ServerInformationIterator_ptr); + static void tao_release (ServerInformationIterator_ptr); + static ServerInformationIterator_ptr tao_nil (void); + static ServerInformationIterator_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); + static CORBA::Object * tao_upcast (void *); + + private: + ServerInformationIterator_ptr ptr_; + // Unimplemented - prevents widening assignment. + ServerInformationIterator_var (const TAO_Base_var &rhs); + ServerInformationIterator_var &operator= (const TAO_Base_var &rhs); + }; + + +#endif /* end #if !defined */ + + +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_) +#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_ + + class TAO_PortableServer_Export ServerInformationIterator_out + { + public: + ServerInformationIterator_out (ServerInformationIterator_ptr &); + ServerInformationIterator_out (ServerInformationIterator_var &); + ServerInformationIterator_out (const ServerInformationIterator_out &); + ServerInformationIterator_out &operator= (const ServerInformationIterator_out &); + ServerInformationIterator_out &operator= (const ServerInformationIterator_var &); + ServerInformationIterator_out &operator= (ServerInformationIterator_ptr); + operator ServerInformationIterator_ptr &(); + ServerInformationIterator_ptr &ptr (void); + ServerInformationIterator_ptr operator-> (void); + + private: + ServerInformationIterator_ptr &ptr_; + }; + + +#endif /* end #if !defined */ #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_) @@ -1710,13 +1777,13 @@ static CORBA::TypeCode_ptr _tc_NotFound; static ServerInformationIterator_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerInformationIterator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerInformationIterator_ptr _nil (void) { @@ -1728,23 +1795,24 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1756,7 +1824,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; protected: ServerInformationIterator (int collocated = 0); - // This methods travese the inheritance tree and set the + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated); @@ -1919,7 +1987,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator; } diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i index 38a7ee435f5..489341a9ec6 100644 --- a/TAO/tao/PortableServer/ImplRepoC.i +++ b/TAO/tao/PortableServer/ImplRepoC.i @@ -23,49 +23,6 @@ #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_ -ACE_INLINE ImplementationRepository::ServerObject_ptr -tao_ImplementationRepository_ServerObject_duplicate ( - ImplementationRepository::ServerObject_ptr p - ) -{ - return ImplementationRepository::ServerObject::_duplicate (p); -} - -ACE_INLINE void -tao_ImplementationRepository_ServerObject_release ( - ImplementationRepository::ServerObject_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE ImplementationRepository::ServerObject_ptr -tao_ImplementationRepository_ServerObject_nil ( - void - ) -{ - return ImplementationRepository::ServerObject::_nil (); -} - -ACE_INLINE ImplementationRepository::ServerObject_ptr -tao_ImplementationRepository_ServerObject_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_ImplementationRepository_ServerObject_upcast ( - void *src - ) -{ - ImplementationRepository::ServerObject **tmp = - ACE_static_cast (ImplementationRepository::ServerObject **, src); - return *tmp; -} - ACE_INLINE ImplementationRepository::ServerObject::ServerObject ( TAO_Stub *objref, @@ -131,7 +88,7 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa { EnvironmentVariable *deep_copy = new EnvironmentVariable (*p.ptr_); - + if (deep_copy != 0) { EnvironmentVariable *tmp = deep_copy; @@ -141,7 +98,7 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa } } } - + return *this; } @@ -164,20 +121,20 @@ ImplementationRepository::EnvironmentVariable_var::operator const ::Implementati } ACE_INLINE -ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast +ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast { return *this->ptr_; } ACE_INLINE -ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast +ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast +ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast { return this->ptr_; } @@ -194,7 +151,7 @@ ImplementationRepository::EnvironmentVariable_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::EnvironmentVariable *& ImplementationRepository::EnvironmentVariable_var::out (void) { @@ -255,7 +212,7 @@ ImplementationRepository::EnvironmentVariable_out::operator= (EnvironmentVariabl return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast { return this->ptr_; @@ -324,10 +281,10 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir { ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_); ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -342,7 +299,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -355,15 +312,15 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir } else this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_); ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } @@ -448,7 +405,7 @@ CORBA::Boolean release) #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_ @@ -504,7 +461,7 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation { EnvironmentList *deep_copy = new EnvironmentList (*p.ptr_); - + if (deep_copy != 0) { EnvironmentList *tmp = deep_copy; @@ -514,7 +471,7 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation } } } - + return *this; } @@ -530,27 +487,27 @@ ImplementationRepository::EnvironmentList_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast { return *this->ptr_; } -ACE_INLINE -ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast +ACE_INLINE +ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast { return *this->ptr_; } -ACE_INLINE -ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast +ACE_INLINE +ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast +ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast { return this->ptr_; } @@ -579,7 +536,7 @@ ImplementationRepository::EnvironmentList_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::EnvironmentList *& ImplementationRepository::EnvironmentList_var::out (void) { @@ -640,7 +597,7 @@ ImplementationRepository::EnvironmentList_out::operator= (EnvironmentList *p) return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast { return this->ptr_; @@ -718,7 +675,7 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR { StartupOptions *deep_copy = new StartupOptions (*p.ptr_); - + if (deep_copy != 0) { StartupOptions *tmp = deep_copy; @@ -728,7 +685,7 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR } } } - + return *this; } @@ -751,20 +708,20 @@ ImplementationRepository::StartupOptions_var::operator const ::ImplementationRep } ACE_INLINE -ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast +ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast { return *this->ptr_; } ACE_INLINE -ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast +ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast +ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast { return this->ptr_; } @@ -781,7 +738,7 @@ ImplementationRepository::StartupOptions_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::StartupOptions *& ImplementationRepository::StartupOptions_var::out (void) { @@ -842,7 +799,7 @@ ImplementationRepository::StartupOptions_out::operator= (StartupOptions *p) return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast { return this->ptr_; @@ -911,7 +868,7 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati { ServerInformation *deep_copy = new ServerInformation (*p.ptr_); - + if (deep_copy != 0) { ServerInformation *tmp = deep_copy; @@ -921,7 +878,7 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati } } } - + return *this; } @@ -944,20 +901,20 @@ ImplementationRepository::ServerInformation_var::operator const ::Implementation } ACE_INLINE -ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast +ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast { return *this->ptr_; } ACE_INLINE -ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast +ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast +ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast { return this->ptr_; } @@ -974,7 +931,7 @@ ImplementationRepository::ServerInformation_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::ServerInformation *& ImplementationRepository::ServerInformation_var::out (void) { @@ -1035,7 +992,7 @@ ImplementationRepository::ServerInformation_out::operator= (ServerInformation *p return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast { return this->ptr_; @@ -1104,10 +1061,10 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve { ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_); ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -1122,7 +1079,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -1135,15 +1092,15 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve } else this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_); ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } @@ -1228,7 +1185,7 @@ CORBA::Boolean release) #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_ @@ -1284,7 +1241,7 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen { ServerInformationList *deep_copy = new ServerInformationList (*p.ptr_); - + if (deep_copy != 0) { ServerInformationList *tmp = deep_copy; @@ -1294,7 +1251,7 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen } } } - + return *this; } @@ -1310,27 +1267,27 @@ ImplementationRepository::ServerInformationList_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast { return *this->ptr_; } -ACE_INLINE -ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast +ACE_INLINE +ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast { return *this->ptr_; } -ACE_INLINE -ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast +ACE_INLINE +ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast +ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast { return this->ptr_; } @@ -1359,7 +1316,7 @@ ImplementationRepository::ServerInformationList_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::ServerInformationList *& ImplementationRepository::ServerInformationList_var::out (void) { @@ -1420,7 +1377,7 @@ ImplementationRepository::ServerInformationList_out::operator= (ServerInformatio return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast { return this->ptr_; @@ -1463,49 +1420,6 @@ ImplementationRepository::ServerInformationList_out::operator[] (CORBA::ULong in #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_ -ACE_INLINE ImplementationRepository::Administration_ptr -tao_ImplementationRepository_Administration_duplicate ( - ImplementationRepository::Administration_ptr p - ) -{ - return ImplementationRepository::Administration::_duplicate (p); -} - -ACE_INLINE void -tao_ImplementationRepository_Administration_release ( - ImplementationRepository::Administration_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE ImplementationRepository::Administration_ptr -tao_ImplementationRepository_Administration_nil ( - void - ) -{ - return ImplementationRepository::Administration::_nil (); -} - -ACE_INLINE ImplementationRepository::Administration_ptr -tao_ImplementationRepository_Administration_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_ImplementationRepository_Administration_upcast ( - void *src - ) -{ - ImplementationRepository::Administration **tmp = - ACE_static_cast (ImplementationRepository::Administration **, src); - return *tmp; -} - ACE_INLINE ImplementationRepository::Administration::Administration ( TAO_Stub *objref, @@ -1524,49 +1438,6 @@ ImplementationRepository::Administration::Administration ( #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_ -ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -tao_ImplementationRepository_ServerInformationIterator_duplicate ( - ImplementationRepository::ServerInformationIterator_ptr p - ) -{ - return ImplementationRepository::ServerInformationIterator::_duplicate (p); -} - -ACE_INLINE void -tao_ImplementationRepository_ServerInformationIterator_release ( - ImplementationRepository::ServerInformationIterator_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -tao_ImplementationRepository_ServerInformationIterator_nil ( - void - ) -{ - return ImplementationRepository::ServerInformationIterator::_nil (); -} - -ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -tao_ImplementationRepository_ServerInformationIterator_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_ImplementationRepository_ServerInformationIterator_upcast ( - void *src - ) -{ - ImplementationRepository::ServerInformationIterator **tmp = - ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src); - return *tmp; -} - ACE_INLINE ImplementationRepository::ServerInformationIterator::ServerInformationIterator ( TAO_Stub *objref, @@ -1581,12 +1452,12 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator ( #endif /* end #if !defined */ -CORBA::Boolean TAO_PortableServer_Export operator<< ( +TAO_PortableServer_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr ); -CORBA::Boolean TAO_PortableServer_Export operator>> ( +TAO_PortableServer_Export CORBA::Boolean operator>> ( TAO_InputCDR &, ImplementationRepository::ServerObject_ptr & ); @@ -1600,7 +1471,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::EnvironmentVariable &_tao_aggregate) @@ -1612,7 +1483,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito return 1; else return 0; - + } @@ -1640,12 +1511,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (ImplementationRepository::ActivationMode, _tao_temp); } - + return _tao_result; } @@ -1660,7 +1531,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::StartupOptions &_tao_aggregate) @@ -1674,7 +1545,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ServerInformation &_tao_aggregate) @@ -1688,7 +1559,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ServerInformation &_tao_aggregate) @@ -1702,7 +1573,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito return 1; else return 0; - + } @@ -1720,22 +1591,22 @@ CORBA::Boolean TAO_PortableServer_Export operator>> ( #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */ -CORBA::Boolean TAO_PortableServer_Export operator<< ( +TAO_PortableServer_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr ); -CORBA::Boolean TAO_PortableServer_Export operator>> ( +TAO_PortableServer_Export CORBA::Boolean operator>> ( TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr & ); -CORBA::Boolean TAO_PortableServer_Export operator<< ( +TAO_PortableServer_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const ImplementationRepository::Administration_ptr ); -CORBA::Boolean TAO_PortableServer_Export operator>> ( +TAO_PortableServer_Export CORBA::Boolean operator>> ( TAO_InputCDR &, ImplementationRepository::Administration_ptr & ); diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp index 137f40dfade..fcc1af898d5 100644 --- a/TAO/tao/PortableServer/ImplRepoS.cpp +++ b/TAO/tao/PortableServer/ImplRepoS.cpp @@ -34,6 +34,7 @@ #if TAO_HAS_INTERCEPTORS == 1 #include "tao/RequestInfo_Util.h" +#include "tao/PICurrent.h" #include "tao/PortableServer/ServerRequestInfo.h" #include "tao/PortableServer/ServerInterceptorAdapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -54,9 +55,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 17:59:21 */ +/* starting time is 10:26:32 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/amh/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -126,10 +127,10 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, + {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel}, {"",0},{"",0}, - {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, + {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, {"",0}, {"_interface", &POA_ImplementationRepository::ServerObject::_interface_skel}, {"",0},{"",0}, @@ -150,7 +151,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch } return 0; } -/* ending time is 17:59:21 */ +/* ending time is 10:26:32 */ static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -160,48 +161,47 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &); - + private: POA_ImplementationRepository::ServerObject *_tao_impl; - + }; TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_ImplementationRepository::ServerObject *tao_impl - ACE_ENV_ARG_DECL_NOT_USED + POA_ImplementationRepository::ServerObject *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) @@ -215,7 +215,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -227,12 +227,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (AC Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -241,7 +241,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_EN CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -269,48 +269,47 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &); - + private: POA_ImplementationRepository::ServerObject *_tao_impl; - + }; TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_ImplementationRepository::ServerObject *tao_impl - ACE_ENV_ARG_DECL_NOT_USED + POA_ImplementationRepository::ServerObject *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) @@ -324,7 +323,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -336,12 +335,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -350,7 +349,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -389,14 +388,14 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::_TAO_S { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ServerObject_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } ImplementationRepository::_TAO_ServerObject_Proxy_Impl& @@ -407,26 +406,26 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select { int strategy = TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy ( int strategy ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -439,7 +438,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -448,7 +447,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -458,9 +457,9 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create ); ACE_CHECK; break; - + } - + } } @@ -480,13 +479,13 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA: int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long) { - ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function; - + return 0; } -static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer)); @@ -518,7 +517,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping ( ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::ServerObject_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/ServerObject:1.0" @@ -548,7 +547,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::ServerObject_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/ServerObject:1.0" @@ -585,7 +584,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping ( )->ping ( ACE_ENV_SINGLE_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown ( @@ -602,25 +601,24 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown )->shutdown ( ACE_ENV_SINGLE_ARG_PARAMETER ); - + } // // End Direct Proxy Implementation /////////////////////////////////////////////////////////////////////// -// skeleton constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_ss.cpp:100 POA_ImplementationRepository::ServerObject::ServerObject (void) { this->optable_ = &tao_ImplementationRepository_ServerObject_optable; } -// copy ctor POA_ImplementationRepository::ServerObject::ServerObject (const ServerObject& rhs) - : TAO_ServantBase (rhs) + : TAO_ServantBase (rhs) {} -// skeleton destructor POA_ImplementationRepository::ServerObject::~ServerObject (void) { } @@ -633,56 +631,63 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( ) { POA_ImplementationRepository::ServerObject *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::ServerObject *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::ServerObject *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ri ( + + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping _tao_ri ( _tao_server_request, _tao_upcall, - _tao_impl - ACE_ENV_ARG_PARAMETER + _tao_impl ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->ping ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->ping ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -690,12 +695,13 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::ServerObject::shutdown_skel ( TAO_ServerRequest &_tao_server_request, @@ -705,56 +711,63 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( ) { POA_ImplementationRepository::ServerObject *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::ServerObject *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::ServerObject *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( + + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown _tao_ri ( _tao_server_request, _tao_upcall, - _tao_impl - ACE_ENV_ARG_PARAMETER + _tao_impl ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->shutdown ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->shutdown ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -762,15 +775,16 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::ServerObject::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL @@ -782,10 +796,10 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); + + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -793,16 +807,17 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( } void POA_ImplementationRepository::ServerObject::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = + _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -810,7 +825,7 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel ( } void POA_ImplementationRepository::ServerObject::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL @@ -819,26 +834,27 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { - _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = + _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -850,7 +866,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -859,12 +875,10 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a ( const char* value - ACE_ENV_ARG_DECL + ACE_ENV_ARG_DECL_NOT_USED ) { - const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - + const char *base_id = "IDL:org.omg/CORBA/Object:1.0"; if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) @@ -884,7 +898,16 @@ void* POA_ImplementationRepository::ServerObject::_downcast ( return 0; } -void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) +const char* POA_ImplementationRepository::ServerObject::_interface_repository_id (void) const +{ + return "IDL:ImplementationRepository/ServerObject:1.0"; +} + +void POA_ImplementationRepository::ServerObject::_dispatch ( + TAO_ServerRequest &req, + void *servant_upcall + ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, @@ -893,30 +916,25 @@ void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &r } -const char* POA_ImplementationRepository::ServerObject::_interface_repository_id (void) const -{ - return "IDL:ImplementationRepository/ServerObject:1.0"; -} - ImplementationRepository::ServerObject* POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL) { TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + TAO_Stub_Auto_Ptr safe_stub (stub); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ()); } @@ -928,9 +946,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 17:59:21 */ +/* starting time is 10:26:32 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/amh/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -1000,23 +1018,23 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"find", &POA_ImplementationRepository::Administration::find_skel}, + {"find", &POA_ImplementationRepository::Administration::find_skel}, {"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel}, {"_interface", &POA_ImplementationRepository::Administration::_interface_skel}, {"",0},{"",0}, - {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, - {"list", &POA_ImplementationRepository::Administration::list_skel}, - {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, + {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, + {"list", &POA_ImplementationRepository::Administration::list_skel}, + {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, {"",0}, - {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, + {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel}, - {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, - {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, + {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, + {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, {"",0}, - {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, + {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, {"",0},{"",0},{"",0},{"",0},{"",0}, - {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, + {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1033,7 +1051,7 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const } return 0; } -/* ending time is 17:59:21 */ +/* ending time is 10:26:32 */ static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -1044,51 +1062,49 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const char * server_; - + }; TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1103,16 +1119,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::a Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1124,20 +1140,20 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::_tc_CannotActivate }; - + exception_list->length (2); for (CORBA::ULong i = 0; i < 2; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1145,7 +1161,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1154,7 +1170,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::r CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1184,44 +1200,43 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server, - const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const char * server_; const ImplementationRepository::StartupOptions & options_; - + }; TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ( @@ -1229,8 +1244,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server, - const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_NOT_USED + const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1246,19 +1260,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::a Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (2); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; (*parameter_list)[len].argument <<= this->options_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1270,19 +1284,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = { ImplementationRepository::Administration::_tc_AlreadyRegistered }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1290,7 +1304,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1299,7 +1313,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::r CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1329,44 +1343,43 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server, - const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const char * server_; const ImplementationRepository::StartupOptions & options_; - + }; TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ( @@ -1374,8 +1387,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server, - const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_NOT_USED + const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1391,19 +1403,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (2); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; (*parameter_list)[len].argument <<= this->options_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1415,12 +1427,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1429,7 +1441,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1458,51 +1470,49 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const char * server_; - + }; TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1517,16 +1527,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arg Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1538,19 +1548,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1558,7 +1568,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1567,7 +1577,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::res CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1596,51 +1606,49 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const char * server_; - + }; TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1655,16 +1663,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::a Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1676,19 +1684,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1696,7 +1704,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1705,7 +1713,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::r CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1736,29 +1744,28 @@ public: , const char * server, const char * addr, - ImplementationRepository::ServerObject_ptr server_object - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ImplementationRepository::ServerObject_ptr server_object ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -1769,7 +1776,7 @@ public: private: TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const char * server_; @@ -1784,8 +1791,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: POA_ImplementationRepository::Administration *tao_impl, const char * server, const char * addr, - ImplementationRepository::ServerObject_ptr server_object - ACE_ENV_ARG_DECL_NOT_USED + ImplementationRepository::ServerObject_ptr server_object ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1802,12 +1808,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (3); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -1817,7 +1823,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: (*parameter_list)[len].argument <<= this->server_object_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1829,19 +1835,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1849,7 +1855,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1858,11 +1864,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1884,7 +1890,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } -void +void TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result) { // Update the result. @@ -1898,51 +1904,49 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const char * server_; - + }; TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1957,16 +1961,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1978,19 +1982,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1998,7 +2002,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2007,7 +2011,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2036,51 +2040,49 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const char * server_; - + }; TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, - const char * server - ACE_ENV_ARG_DECL_NOT_USED + const char * server ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2095,16 +2097,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2116,19 +2118,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = { ImplementationRepository::Administration::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i]; - TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -2136,7 +2138,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions ( } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2145,7 +2147,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2174,44 +2176,43 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , - const CORBA::ULong & how_many - - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const CORBA::ULong & how_many + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &); - + private: POA_ImplementationRepository::Administration *_tao_impl; const CORBA::ULong & how_many_; - + }; @@ -2219,12 +2220,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, - const CORBA::ULong & how_many - ACE_ENV_ARG_DECL_NOT_USED + const CORBA::ULong & how_many + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), - how_many_ (how_many) + how_many_ (how_many) {} @@ -2236,16 +2237,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= how_many_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2258,12 +2259,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2272,7 +2273,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2311,14 +2312,14 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::_TAO { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } ImplementationRepository::_TAO_Administration_Proxy_Impl& @@ -2329,26 +2330,26 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::sele { int strategy = TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy ( int strategy ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -2361,7 +2362,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -2370,7 +2371,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -2380,9 +2381,9 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea ); ACE_CHECK; break; - + } - + } } @@ -2402,13 +2403,13 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORB int ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long) { - ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function; - + return 0; } -static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer)); @@ -2427,9 +2428,9 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )) { TAO_Object_Adapter::Servant_Upcall servant_upcall ( @@ -2443,14 +2444,13 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" ) )->activate_server ( - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); return; } @@ -2462,8 +2462,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )) { TAO_Object_Adapter::Servant_Upcall servant_upcall ( @@ -2477,15 +2477,14 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" ) )->register_server ( server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); return; } @@ -2511,15 +2510,14 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" ) )->reregister_server ( server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); return; } @@ -2530,8 +2528,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { TAO_Object_Adapter::Servant_Upcall servant_upcall ( @@ -2545,14 +2543,13 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" ) )->remove_server ( - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); return; } @@ -2563,8 +2560,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { TAO_Object_Adapter::Servant_Upcall servant_upcall ( @@ -2578,14 +2575,13 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" ) )->shutdown_server ( - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); return; } @@ -2598,11 +2594,11 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { - CORBA::String_var _tao_retval; + CORBA::String_var _tao_retval; ACE_UNUSED_ARG (_tao_retval); TAO_Object_Adapter::Servant_Upcall servant_upcall ( _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () @@ -2614,8 +2610,8 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser forward_to.out () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( + ACE_CHECK_RETURN (_tao_retval._retn ()); + return ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" @@ -2623,8 +2619,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser )->server_is_running ( server, addr, - server_object - ACE_ENV_ARG_PARAMETER + server_object ACE_ENV_ARG_PARAMETER ); } @@ -2634,8 +2629,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { TAO_Object_Adapter::Servant_Upcall servant_upcall ( @@ -2649,14 +2644,13 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" ) )->server_is_shutting_down ( - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); return; } @@ -2668,8 +2662,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { TAO_Object_Adapter::Servant_Upcall servant_upcall ( @@ -2683,15 +2677,14 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" ) )->find ( server, - info - ACE_ENV_ARG_PARAMETER + info ACE_ENV_ARG_PARAMETER ); return; } @@ -2718,7 +2711,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/Administration:1.0" @@ -2726,8 +2719,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list )->list ( how_many, server_list, - server_iterator - ACE_ENV_ARG_PARAMETER + server_iterator ACE_ENV_ARG_PARAMETER ); return; } @@ -2750,19 +2742,18 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )) { ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->activate_server ( - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server ( @@ -2772,8 +2763,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )) { ACE_reinterpret_cast ( @@ -2781,10 +2772,9 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->register_server ( server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server ( @@ -2802,10 +2792,9 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->reregister_server ( server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server ( @@ -2814,18 +2803,17 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->remove_server ( - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server ( @@ -2834,18 +2822,17 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->shutdown_server ( - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - + } char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running ( @@ -2856,8 +2843,8 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { return ACE_reinterpret_cast ( @@ -2866,10 +2853,9 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv )->server_is_running ( server, addr, - server_object - ACE_ENV_ARG_PARAMETER + server_object ACE_ENV_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down ( @@ -2878,18 +2864,17 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { ACE_reinterpret_cast ( POA_ImplementationRepository::Administration_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->server_is_shutting_down ( - server - ACE_ENV_ARG_PARAMETER + server ACE_ENV_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find ( @@ -2899,8 +2884,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { ACE_reinterpret_cast ( @@ -2908,10 +2893,9 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->find ( server, - info - ACE_ENV_ARG_PARAMETER + info ACE_ENV_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list ( @@ -2931,28 +2915,26 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list )->list ( how_many, server_list, - server_iterator - ACE_ENV_ARG_PARAMETER + server_iterator ACE_ENV_ARG_PARAMETER ); - + } // // End Direct Proxy Implementation /////////////////////////////////////////////////////////////////////// -// skeleton constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_ss.cpp:100 POA_ImplementationRepository::Administration::Administration (void) { this->optable_ = &tao_ImplementationRepository_Administration_optable; } -// copy ctor POA_ImplementationRepository::Administration::Administration (const Administration& rhs) - : TAO_ServantBase (rhs) + : TAO_ServantBase (rhs) {} -// skeleton destructor POA_ImplementationRepository::Administration::~Administration (void) { } @@ -2966,64 +2948,70 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); CORBA::String_var server; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, - server.in () - ACE_ENV_ARG_PARAMETER + server.in () ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->activate_server ( - server.in () - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->activate_server ( + server.in () ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3031,12 +3019,13 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::register_server_skel ( TAO_ServerRequest &_tao_server_request, @@ -3047,8 +3036,10 @@ void POA_ImplementationRepository::Administration::register_server_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); CORBA::String_var server; ImplementationRepository::StartupOptions options; @@ -3056,59 +3047,63 @@ void POA_ImplementationRepository::Administration::register_server_skel ( (_tao_in >> server.out ()) && (_tao_in >> options) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, server.in (), - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->register_server ( - server.in (), - options - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->register_server ( + server.in (), + options ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3116,12 +3111,13 @@ void POA_ImplementationRepository::Administration::register_server_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::reregister_server_skel ( TAO_ServerRequest &_tao_server_request, @@ -3132,8 +3128,10 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); CORBA::String_var server; ImplementationRepository::StartupOptions options; @@ -3141,59 +3139,63 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( (_tao_in >> server.out ()) && (_tao_in >> options) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, server.in (), - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->reregister_server ( - server.in (), - options - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->reregister_server ( + server.in (), + options ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3201,12 +3203,13 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::remove_server_skel ( TAO_ServerRequest &_tao_server_request, @@ -3217,64 +3220,70 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); CORBA::String_var server; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, - server.in () - ACE_ENV_ARG_PARAMETER + server.in () ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->remove_server ( - server.in () - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->remove_server ( + server.in () ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3282,12 +3291,13 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::shutdown_server_skel ( TAO_ServerRequest &_tao_server_request, @@ -3298,64 +3308,70 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); CORBA::String_var server; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, - server.in () - ACE_ENV_ARG_PARAMETER + server.in () ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->shutdown_server ( - server.in () - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->shutdown_server ( + server.in () ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3363,12 +3379,13 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::server_is_running_skel ( TAO_ServerRequest &_tao_server_request, @@ -3379,9 +3396,11 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - - CORBA::String_var _tao_retval; + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); + CORBA::String_var _tao_retval; CORBA::String_var server; CORBA::String_var addr; ImplementationRepository::ServerObject_var server_object; @@ -3390,64 +3409,68 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( (_tao_in >> addr.out ()) && (_tao_in >> server_object.out ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, server.in (), addr.in (), - server_object.in () - ACE_ENV_ARG_PARAMETER + server_object.in () ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = - _tao_impl->server_is_running ( - server.in (), - addr.in (), - server_object.in () - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + _tao_retval = + _tao_impl->server_is_running ( + server.in (), + addr.in (), + server_object.in () ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) + } + char * _tao_retval_info = _tao_retval._retn (); - ri.result (_tao_retval_info); + _tao_ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3455,19 +3478,20 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::server_is_shutting_down_skel ( TAO_ServerRequest &_tao_server_request, @@ -3478,64 +3502,70 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); CORBA::String_var server; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, - server.in () - ACE_ENV_ARG_PARAMETER + server.in () ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->server_is_shutting_down ( - server.in () - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->server_is_shutting_down ( + server.in () ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3543,12 +3573,13 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::find_skel ( TAO_ServerRequest &_tao_server_request, @@ -3559,65 +3590,71 @@ void POA_ImplementationRepository::Administration::find_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); CORBA::String_var server; ImplementationRepository::ServerInformation_var info; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_find ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_find _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, - server.in () - ACE_ENV_ARG_PARAMETER + server.in () ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->find ( - server.in (), - info.out () - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->find ( + server.in (), + info.out () ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3625,19 +3662,20 @@ void POA_ImplementationRepository::Administration::find_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << info.in ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::list_skel ( TAO_ServerRequest &_tao_server_request, @@ -3648,68 +3686,74 @@ void POA_ImplementationRepository::Administration::list_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::Administration *, + _tao_object_reference + ); CORBA::ULong how_many; ImplementationRepository::ServerInformationList_var server_list; ImplementationRepository::ServerInformationIterator_var server_iterator; if (!( (_tao_in >> how_many) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_Administration_list ri ( + + TAO_ServerRequestInfo_ImplementationRepository_Administration_list _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, - how_many - - ACE_ENV_ARG_PARAMETER + how_many + ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->list ( - how_many, - server_list.out (), - server_iterator.out () - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->list ( + how_many, + server_list.out (), + server_iterator.out () ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3717,23 +3761,24 @@ void POA_ImplementationRepository::Administration::list_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << server_list.in ()) && (_tao_out << server_iterator.in ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::Administration::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL @@ -3745,10 +3790,10 @@ void POA_ImplementationRepository::Administration::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); + + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -3756,16 +3801,17 @@ void POA_ImplementationRepository::Administration::_is_a_skel ( } void POA_ImplementationRepository::Administration::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = + _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -3773,7 +3819,7 @@ void POA_ImplementationRepository::Administration::_non_existent_skel ( } void POA_ImplementationRepository::Administration::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL @@ -3782,26 +3828,27 @@ void POA_ImplementationRepository::Administration::_interface_skel ( POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { - _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = + _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -3813,7 +3860,7 @@ void POA_ImplementationRepository::Administration::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -3822,12 +3869,10 @@ void POA_ImplementationRepository::Administration::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::Administration::_is_a ( const char* value - ACE_ENV_ARG_DECL + ACE_ENV_ARG_DECL_NOT_USED ) { - const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - + const char *base_id = "IDL:org.omg/CORBA/Object:1.0"; if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) @@ -3847,7 +3892,16 @@ void* POA_ImplementationRepository::Administration::_downcast ( return 0; } -void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) +const char* POA_ImplementationRepository::Administration::_interface_repository_id (void) const +{ + return "IDL:ImplementationRepository/Administration:1.0"; +} + +void POA_ImplementationRepository::Administration::_dispatch ( + TAO_ServerRequest &req, + void *servant_upcall + ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, @@ -3856,30 +3910,25 @@ void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest } -const char* POA_ImplementationRepository::Administration::_interface_repository_id (void) const -{ - return "IDL:ImplementationRepository/Administration:1.0"; -} - ImplementationRepository::Administration* POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL) { TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + TAO_Stub_Auto_Ptr safe_stub (stub); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ()); } @@ -3891,9 +3940,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 17:59:21 */ +/* starting time is 10:26:32 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/amh/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -3964,8 +4013,8 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel}, - {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, - {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, + {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, + {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, {"",0},{"",0}, {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel}, {"",0},{"",0}, @@ -3986,7 +4035,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo } return 0; } -/* ending time is 17:59:21 */ +/* ending time is 10:26:32 */ static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -3997,29 +4046,28 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl , - const CORBA::ULong & how_many - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + const CORBA::ULong & how_many ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -4030,7 +4078,7 @@ public: private: TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); - + private: POA_ImplementationRepository::ServerInformationIterator *_tao_impl; const CORBA::ULong & how_many_; @@ -4041,8 +4089,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerInformationIterator *tao_impl, - const CORBA::ULong & how_many - ACE_ENV_ARG_DECL_NOT_USED + const CORBA::ULong & how_many ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4057,16 +4104,16 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= how_many_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4078,12 +4125,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4092,11 +4139,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -4118,7 +4165,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } -void +void TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result) { // Update the result. @@ -4131,48 +4178,47 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); - + private: POA_ImplementationRepository::ServerInformationIterator *_tao_impl; - + }; TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_ImplementationRepository::ServerInformationIterator *tao_impl - ACE_ENV_ARG_DECL_NOT_USED + POA_ImplementationRepository::ServerInformationIterator *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) @@ -4186,7 +4232,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -4198,12 +4244,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4212,7 +4258,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -4251,14 +4297,14 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& @@ -4269,26 +4315,26 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B { int strategy = TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy ( int strategy ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -4301,7 +4347,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -4310,7 +4356,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -4320,9 +4366,9 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B ); ACE_CHECK; break; - + } - + } } @@ -4342,13 +4388,13 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_fun int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long) { - ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function; - + return 0; } -static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer)); @@ -4383,16 +4429,15 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru forward_to.out () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (_tao_retval); - return ACE_reinterpret_cast ( + ACE_CHECK_RETURN (_tao_retval); + return ACE_reinterpret_cast ( POA_ImplementationRepository::ServerInformationIterator_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/ServerInformationIterator:1.0" ) )->next_n ( how_many, - server_list - ACE_ENV_ARG_PARAMETER + server_list ACE_ENV_ARG_PARAMETER ); } @@ -4415,7 +4460,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_ ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( + ACE_reinterpret_cast ( POA_ImplementationRepository::ServerInformationIterator_ptr, servant_upcall.servant ()->_downcast ( "IDL:ImplementationRepository/ServerInformationIterator:1.0" @@ -4453,10 +4498,9 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0") )->next_n ( how_many, - server_list - ACE_ENV_ARG_PARAMETER + server_list ACE_ENV_ARG_PARAMETER ); - + } void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy ( @@ -4473,25 +4517,24 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_I )->destroy ( ACE_ENV_SINGLE_ARG_PARAMETER ); - + } // // End Direct Proxy Implementation /////////////////////////////////////////////////////////////////////// -// skeleton constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_ss.cpp:100 POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void) { this->optable_ = &tao_ImplementationRepository_ServerInformationIterator_optable; } -// copy ctor POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (const ServerInformationIterator& rhs) - : TAO_ServantBase (rhs) + : TAO_ServantBase (rhs) {} -// skeleton destructor POA_ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void) { } @@ -4505,68 +4548,74 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::ServerInformationIterator *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::ServerInformationIterator *, + _tao_object_reference + ); CORBA::Boolean _tao_retval = 0; CORBA::ULong how_many; ImplementationRepository::ServerInformationList_var server_list; if (!( (_tao_in >> how_many) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri ( + + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n _tao_ri ( _tao_server_request, _tao_upcall, _tao_impl, - how_many - ACE_ENV_ARG_PARAMETER + how_many ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = - _tao_impl->next_n ( - how_many, - server_list.out () - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + _tao_retval = + _tao_impl->next_n ( + how_many, + server_list.out () ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) + } + CORBA::Boolean _tao_retval_info = _tao_retval; - ri.result (_tao_retval_info); - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + _tao_ri.result (_tao_retval_info); + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -4574,20 +4623,21 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) && (_tao_out << server_list.in ()) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( TAO_ServerRequest &_tao_server_request, @@ -4597,56 +4647,63 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = - ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator *, _tao_object_reference); - + ACE_static_cast ( + POA_ImplementationRepository::ServerInformationIterator *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( + + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy _tao_ri ( _tao_server_request, _tao_upcall, - _tao_impl - ACE_ENV_ARG_PARAMETER + _tao_impl ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->destroy ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->destroy ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -4654,15 +4711,16 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); -} + + } void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL @@ -4674,10 +4732,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); + + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4685,16 +4743,17 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( } void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = + _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4702,7 +4761,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel } void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL @@ -4711,26 +4770,27 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { - _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = + _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -4742,7 +4802,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -4751,12 +4811,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a ( const char* value - ACE_ENV_ARG_DECL + ACE_ENV_ARG_DECL_NOT_USED ) { - const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - + const char *base_id = "IDL:org.omg/CORBA/Object:1.0"; if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) @@ -4776,7 +4834,16 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast ( return 0; } -void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) +const char* POA_ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const +{ + return "IDL:ImplementationRepository/ServerInformationIterator:1.0"; +} + +void POA_ImplementationRepository::ServerInformationIterator::_dispatch ( + TAO_ServerRequest &req, + void *servant_upcall + ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, @@ -4785,30 +4852,25 @@ void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_Ser } -const char* POA_ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const -{ - return "IDL:ImplementationRepository/ServerInformationIterator:1.0"; -} - ImplementationRepository::ServerInformationIterator* POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_ARG_DECL) { TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + TAO_Stub_Auto_Ptr safe_stub (stub); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ()); } diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h index 136d8d42c82..52768582ec7 100644 --- a/TAO/tao/PortableServer/ImplRepoS.h +++ b/TAO/tao/PortableServer/ImplRepoS.h @@ -35,6 +35,7 @@ #include "tao/PortableServer/Collocated_Object.h" #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h" #include "tao/PortableServer/Direct_Object_Proxy_Impl.h" + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -54,7 +55,7 @@ TAO_NAMESPACE POA_ImplementationRepository class _TAO_ServerObject_ThruPOA_Proxy_Impl; class _TAO_ServerObject_Direct_Proxy_Impl; class _TAO_ServerObject_Strategized_Proxy_Broker; - + class TAO_PortableServer_Export ServerObject : public virtual PortableServer::ServantBase { @@ -68,8 +69,8 @@ TAO_NAMESPACE POA_ImplementationRepository virtual CORBA::Boolean _is_a ( const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual void* _downcast ( const char* logical_type_id @@ -103,18 +104,19 @@ TAO_NAMESPACE POA_ImplementationRepository ); ::ImplementationRepository::ServerObject *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; virtual void ping ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void ping_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -123,12 +125,13 @@ TAO_NAMESPACE POA_ImplementationRepository ); virtual void shutdown ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void shutdown_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -139,23 +142,23 @@ TAO_NAMESPACE POA_ImplementationRepository }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - + class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker { - public: + public: _TAO_ServerObject_Strategized_Proxy_Broker (void); - + virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void); - + virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy ( ::ImplementationRepository::ServerObject *object ACE_ENV_ARG_DECL ); - + private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. @@ -163,41 +166,41 @@ TAO_NAMESPACE POA_ImplementationRepository int collocation_strategy ACE_ENV_ARG_DECL ); - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; - + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. - + public: static _TAO_ServerObject_Strategized_Proxy_Broker *the_TAO_ServerObject_Strategized_Proxy_Broker (void); }; - - + + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // ThruPOA Impl. Declaration // - - class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : + + class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl { public: _TAO_ServerObject_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) { } - + virtual void ping ( CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL @@ -205,7 +208,7 @@ TAO_NAMESPACE POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void shutdown ( CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL @@ -213,28 +216,28 @@ TAO_NAMESPACE POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - - + + }; - + // // ThruPOA Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // -class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : +class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : public virtual ImplementationRepository::_TAO_ServerObject_Proxy_Impl, public virtual TAO_Direct_Object_Proxy_Impl { public: _TAO_ServerObject_Direct_Proxy_Impl (void); - + virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) { } - + virtual void ping ( CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL @@ -242,7 +245,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void shutdown ( CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL @@ -250,7 +253,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + }; @@ -279,8 +282,8 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual void* _downcast ( const char* logical_type_id @@ -314,21 +317,21 @@ public: ); ::ImplementationRepository::Administration *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; virtual void activate_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )) = 0; - + static void activate_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -339,13 +342,13 @@ public: virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )) = 0; - + static void register_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -356,12 +359,12 @@ public: virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void reregister_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -371,13 +374,13 @@ public: virtual void remove_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; - + static void remove_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -387,13 +390,13 @@ public: virtual void shutdown_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; - + static void shutdown_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -405,13 +408,13 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; - + static void server_is_running_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -421,13 +424,13 @@ public: virtual void server_is_shutting_down ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; - + static void server_is_shutting_down_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -438,13 +441,13 @@ public: virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) = 0; - + static void find_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -456,12 +459,12 @@ public: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void list_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -474,16 +477,16 @@ public: /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker { -public: +public: _TAO_Administration_Strategized_Proxy_Broker (void); - + virtual ~_TAO_Administration_Strategized_Proxy_Broker (void); - + virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy ( ::ImplementationRepository::Administration *object ACE_ENV_ARG_DECL @@ -496,13 +499,13 @@ private: int collocation_strategy ACE_ENV_ARG_DECL ); - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. ::ImplementationRepository::_TAO_Administration_Proxy_Impl *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; - + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -514,7 +517,7 @@ public: // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -522,26 +525,26 @@ public: // ThruPOA Impl. Declaration // -class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : +class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl { public: _TAO_Administration_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) { } - + virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )); - + virtual void register_server ( CORBA_Object *_collocated_tao_target_, const char * server, @@ -549,10 +552,10 @@ public: ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )); - + virtual void reregister_server ( CORBA_Object *_collocated_tao_target_, const char * server, @@ -562,27 +565,27 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual char * server_is_running ( CORBA_Object *_collocated_tao_target_, const char * server, @@ -591,20 +594,20 @@ public: ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual void find ( CORBA_Object *_collocated_tao_target_, const char * server, @@ -612,10 +615,10 @@ public: ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual void list ( CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, @@ -626,8 +629,8 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - - + + }; // @@ -639,26 +642,26 @@ public: // Direct Impl. Declaration // -class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : +class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl, public virtual TAO_Direct_Object_Proxy_Impl { public: _TAO_Administration_Direct_Proxy_Impl (void); - + virtual ~_TAO_Administration_Direct_Proxy_Impl (void) { } - + virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )); - + virtual void register_server ( CORBA_Object *_collocated_tao_target_, const char * server, @@ -666,10 +669,10 @@ public: ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )); - + virtual void reregister_server ( CORBA_Object *_collocated_tao_target_, const char * server, @@ -679,27 +682,27 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual char * server_is_running ( CORBA_Object *_collocated_tao_target_, const char * server, @@ -708,20 +711,20 @@ public: ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual void find ( CORBA_Object *_collocated_tao_target_, const char * server, @@ -729,10 +732,10 @@ public: ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + virtual void list ( CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, @@ -743,7 +746,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + }; @@ -772,8 +775,8 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual void* _downcast ( const char* logical_type_id @@ -807,20 +810,20 @@ public: ); ::ImplementationRepository::ServerInformationIterator *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void next_n_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -829,12 +832,13 @@ public: ); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void destroy_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, @@ -847,16 +851,16 @@ public: /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker { -public: +public: _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); - + virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); - + virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( ::ImplementationRepository::ServerInformationIterator *object ACE_ENV_ARG_DECL @@ -869,13 +873,13 @@ private: int collocation_strategy ACE_ENV_ARG_DECL ); - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; - + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -887,7 +891,7 @@ public: // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -895,15 +899,15 @@ public: // ThruPOA Impl. Declaration // -class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : +class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl { public: _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::Boolean next_n ( CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, @@ -913,7 +917,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void destroy ( CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL @@ -921,8 +925,8 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - - + + }; // @@ -934,15 +938,15 @@ public: // Direct Impl. Declaration // -class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : +class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : public virtual ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl, public virtual TAO_Direct_Object_Proxy_Impl { public: _TAO_ServerInformationIterator_Direct_Proxy_Impl (void); - + virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) { } - + virtual CORBA::Boolean next_n ( CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, @@ -952,7 +956,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void destroy ( CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL @@ -960,7 +964,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + }; diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h index 676cbf18c73..409ed7283e8 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.h +++ b/TAO/tao/PortableServer/ImplRepoS_T.h @@ -48,7 +48,7 @@ TAO_NAMESPACE POA_ImplementationRepository // ctor with T*, ownership flag and a POA ~ServerObject_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -60,30 +60,32 @@ TAO_NAMESPACE POA_ImplementationRepository // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); void ping ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + void shutdown ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed ServerObject_tie (const ServerObject_tie &); void operator= (const ServerObject_tie &); @@ -104,7 +106,7 @@ TAO_NAMESPACE POA_ImplementationRepository // ctor with T*, ownership flag and a POA ~Administration_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -116,103 +118,103 @@ TAO_NAMESPACE POA_ImplementationRepository // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); void activate_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )); - + void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )); - + void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + void remove_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + void shutdown_server ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + char * server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + void server_is_shutting_down ( const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + void find ( const char * server, ImplementationRepository::ServerInformation_out info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )); - + void list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed Administration_tie (const Administration_tie &); void operator= (const Administration_tie &); @@ -233,7 +235,7 @@ TAO_NAMESPACE POA_ImplementationRepository // ctor with T*, ownership flag and a POA ~ServerInformationIterator_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -245,32 +247,33 @@ TAO_NAMESPACE POA_ImplementationRepository // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed ServerInformationIterator_tie (const ServerInformationIterator_tie &); void operator= (const ServerInformationIterator_tie &); diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i index dc5b9eae4e1..f1723ab0fc6 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.i +++ b/TAO/tao/PortableServer/ImplRepoS_T.i @@ -23,30 +23,30 @@ template <class T> ACE_INLINE POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE @@ -100,6 +100,7 @@ POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ template <class T> ACE_INLINE void POA_ImplementationRepository::ServerObject_tie<T>::ping ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -113,6 +114,7 @@ ACE_ENV_SINGLE_ARG_PARAMETER template <class T> ACE_INLINE void POA_ImplementationRepository::ServerObject_tie<T>::shutdown ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -130,30 +132,30 @@ ACE_ENV_SINGLE_ARG_PARAMETER template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE @@ -211,14 +213,13 @@ void POA_ImplementationRepository::Administration_tie<T>::activate_server ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate + CORBA::SystemException + , ImplementationRepository::Administration::NotFound + , ImplementationRepository::Administration::CannotActivate )) { this->ptr_->activate_server ( -server - ACE_ENV_ARG_PARAMETER +server ACE_ENV_ARG_PARAMETER ); } @@ -229,14 +230,13 @@ void POA_ImplementationRepository::Administration_tie<T>::register_server ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered + CORBA::SystemException + , ImplementationRepository::Administration::AlreadyRegistered )) { this->ptr_->register_server ( server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); } @@ -252,8 +252,7 @@ void POA_ImplementationRepository::Administration_tie<T>::reregister_server ( { this->ptr_->reregister_server ( server, - options - ACE_ENV_ARG_PARAMETER + options ACE_ENV_ARG_PARAMETER ); } @@ -263,13 +262,12 @@ void POA_ImplementationRepository::Administration_tie<T>::remove_server ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { this->ptr_->remove_server ( -server - ACE_ENV_ARG_PARAMETER +server ACE_ENV_ARG_PARAMETER ); } @@ -279,13 +277,12 @@ void POA_ImplementationRepository::Administration_tie<T>::shutdown_server ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { this->ptr_->shutdown_server ( -server - ACE_ENV_ARG_PARAMETER +server ACE_ENV_ARG_PARAMETER ); } @@ -297,15 +294,14 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { return this->ptr_->server_is_running ( server, addr, - server_object - ACE_ENV_ARG_PARAMETER + server_object ACE_ENV_ARG_PARAMETER ); } @@ -315,13 +311,12 @@ void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_dow ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { this->ptr_->server_is_shutting_down ( -server - ACE_ENV_ARG_PARAMETER +server ACE_ENV_ARG_PARAMETER ); } @@ -332,14 +327,13 @@ void POA_ImplementationRepository::Administration_tie<T>::find ( ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound + CORBA::SystemException + , ImplementationRepository::Administration::NotFound )) { this->ptr_->find ( server, - info - ACE_ENV_ARG_PARAMETER + info ACE_ENV_ARG_PARAMETER ); } @@ -357,8 +351,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list ( this->ptr_->list ( how_many, server_list, - server_iterator - ACE_ENV_ARG_PARAMETER + server_iterator ACE_ENV_ARG_PARAMETER ); } @@ -368,30 +361,30 @@ how_many, template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE @@ -455,13 +448,13 @@ CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::n { return this->ptr_->next_n ( how_many, - server_list - ACE_ENV_ARG_PARAMETER + server_list ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index bd615184ac6..80144eafcc9 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -48,6 +48,7 @@ CPP_SRCS += \ POA_Policy_Set \ Default_Policy_Validator \ IORInfo \ + Default_ORTC \ ObjectReferenceFactory \ ObjectReferenceTemplate \ AMH_Response_Handler \ diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor index 42f132b1144..612fb710af5 100644 --- a/TAO/tao/PortableServer/Makefile.bor +++ b/TAO/tao/PortableServer/Makefile.bor @@ -10,6 +10,7 @@ OBJFILES = \ $(OBJDIR)\Collocated_Object.obj \ $(OBJDIR)\Default_Acceptor_Filter.obj \ $(OBJDIR)\Default_Policy_Validator.obj \ + $(OBJDIR)\Default_ORTC.obj \ $(OBJDIR)\Default_Servant_Dispatcher.obj \ $(OBJDIR)\Direct_Object_Proxy_Impl.obj \ $(OBJDIR)\ImplRepoC.obj \ diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.h b/TAO/tao/PortableServer/ObjectReferenceFactory.h index 4f6a75e3e9e..9743aedfa4d 100644 --- a/TAO/tao/PortableServer/ObjectReferenceFactory.h +++ b/TAO/tao/PortableServer/ObjectReferenceFactory.h @@ -18,17 +18,15 @@ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ObjectReferenceTemplateC.h" -#include "tao/PortableServer/PortableServerC.h" - +#include "Default_ORTC.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/PortableServerC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -46,8 +44,8 @@ class TAO_POA; * interface. */ class TAO_PortableServer_Export TAO_ObjectReferenceFactory - : public CORBA::DefaultValueRefCountBase, - public virtual PortableInterceptor::ObjectReferenceFactory + : public virtual CORBA::DefaultValueRefCountBase + , public virtual OBV_TAO_Default_ORT::ObjectReferenceFactory { public: diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h index 904dbc8f659..a30e938e38a 100644 --- a/TAO/tao/PortableServer/ObjectReferenceTemplate.h +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h @@ -18,18 +18,13 @@ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" - -#include "tao/ObjectReferenceTemplateC.h" - -#include "tao/ValueBase.h" -#include "tao/Sequence_T.h" +#include "Default_ORTC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -38,7 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - class TAO_POA; /** @@ -48,8 +42,8 @@ class TAO_POA; * interface. */ class TAO_PortableServer_Export TAO_ObjectReferenceTemplate - : public CORBA::DefaultValueRefCountBase, - public virtual PortableInterceptor::ObjectReferenceTemplate + : public virtual CORBA::DefaultValueRefCountBase + , public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate { public: diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 0689ed2d10f..226f11bc1be 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_CORBA_POLICYS_CPP_ -#define _TAO_IDL_CORBA_POLICYS_CPP_ +#ifndef _TAO_IDL_ORIG_POLICYS_CPP_ +#define _TAO_IDL_ORIG_POLICYS_CPP_ #include "PolicyS.h" @@ -34,6 +34,7 @@ #if TAO_HAS_INTERCEPTORS == 1 #include "tao/RequestInfo_Util.h" +#include "tao/PICurrent.h" #include "tao/PortableServer/ServerRequestInfo.h" #include "tao/PortableServer/ServerInterceptorAdapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -54,9 +55,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 12:07:54 */ +/* starting time is 19:31:31 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/amh/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -119,22 +120,23 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len MIN_HASH_VALUE = 4, MAX_HASH_VALUE = 16, HASH_VALUE_RANGE = 13, - DUPLICATES = 0 + DUPLICATES = 0, + WORDLIST_SIZE = 10 }; static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"copy", &POA_CORBA_Policy::copy_skel}, - {"_is_a", &POA_CORBA_Policy::_is_a_skel}, + {"copy", &POA_CORBA::Policy::copy_skel}, + {"_is_a", &POA_CORBA::Policy::_is_a_skel}, {"",0}, - {"destroy", &POA_CORBA_Policy::destroy_skel}, + {"destroy", &POA_CORBA::Policy::destroy_skel}, {"",0},{"",0}, - {"_interface", &POA_CORBA_Policy::_interface_skel}, + {"_interface", &POA_CORBA::Policy::_interface_skel}, {"",0},{"",0}, - {"_non_existent", &POA_CORBA_Policy::_non_existent_skel}, + {"_non_existent", &POA_CORBA::Policy::_non_existent_skel}, {"",0},{"",0}, - {"_get_policy_type", &POA_CORBA_Policy::_get_policy_type_skel}, + {"_get_policy_type", &POA_CORBA::Policy::_get_policy_type_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -151,7 +153,7 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len } return 0; } -/* ending time is 12:07:54 */ +/* ending time is 19:31:31 */ static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -160,30 +162,29 @@ class TAO_ServerRequestInfo_CORBA_Policy_policy_type_get : public TAO_ServerRequ public: TAO_ServerRequestInfo_CORBA_Policy_policy_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, - POA_CORBA_Policy *tao_impl - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -194,17 +195,16 @@ public: private: TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &); - + private: - POA_CORBA_Policy *_tao_impl; + POA_CORBA::Policy *_tao_impl; CORBA::PolicyType _result; }; TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_Policy_policy_type_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Policy *tao_impl - ACE_ENV_ARG_DECL_NOT_USED + POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) @@ -218,7 +218,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_AR Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -230,11 +230,12 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_A Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * + +CORBA::Any * TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -243,11 +244,11 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_D CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -269,7 +270,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_is_a ( return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } -void +void TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result) { // Update the result. @@ -281,51 +282,49 @@ class TAO_ServerRequestInfo_CORBA_Policy_copy : public TAO_ServerRequestInfo public: TAO_ServerRequestInfo_CORBA_Policy_copy ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, - POA_CORBA_Policy *tao_impl - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void result (CORBA::Policy_ptr result); + void result (::CORBA::Policy_ptr result); private: TAO_ServerRequestInfo_CORBA_Policy_copy (const TAO_ServerRequestInfo_CORBA_Policy_copy &); void operator= (const TAO_ServerRequestInfo_CORBA_Policy_copy &); - + private: - POA_CORBA_Policy *_tao_impl; - CORBA::Policy_ptr _result; + POA_CORBA::Policy *_tao_impl; + ::CORBA::Policy_ptr _result; }; TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Policy *tao_impl - ACE_ENV_ARG_DECL_NOT_USED + POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) @@ -339,7 +338,7 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -351,11 +350,12 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * + +CORBA::Any * TAO_ServerRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -364,11 +364,11 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL) CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -390,8 +390,8 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_is_a ( return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } -void -TAO_ServerRequestInfo_CORBA_Policy_copy::result (CORBA::Policy_ptr result) +void +TAO_ServerRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result) { // Update the result. this->_result = result; @@ -402,50 +402,48 @@ class TAO_ServerRequestInfo_CORBA_Policy_destroy : public TAO_ServerRequestInfo public: TAO_ServerRequestInfo_CORBA_Policy_destroy ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, - POA_CORBA_Policy *tao_impl - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual Dynamic::ParameterList * arguments ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_Policy_destroy (const TAO_ServerRequestInfo_CORBA_Policy_destroy &); void operator= (const TAO_ServerRequestInfo_CORBA_Policy_destroy &); - + private: - POA_CORBA_Policy *_tao_impl; - + POA_CORBA::Policy *_tao_impl; + }; TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_destroy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Policy *tao_impl - ACE_ENV_ARG_DECL_NOT_USED + POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) @@ -459,7 +457,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -471,11 +469,12 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * + +CORBA::Any * TAO_ServerRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -484,7 +483,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL) CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -513,54 +512,54 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a ( // // Factory function Implementation. -POA_CORBA_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker (void) { - static POA_CORBA_TAO_Policy_Strategized_Proxy_Broker strategized_proxy_broker; + static POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker strategized_proxy_broker; return &strategized_proxy_broker; } -POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::_TAO_Policy_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } -POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::~POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void) +POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::~_TAO_Policy_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } -CORBA_TAO_Policy_Proxy_Impl& -POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy ( +CORBA::_TAO_Policy_Proxy_Impl& +POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::select_proxy ( ::CORBA::Policy *object ACE_ENV_ARG_DECL ) { int strategy = TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void -POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::create_proxy ( +void +POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy ( int strategy ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -568,24 +567,33 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::create_proxy ( case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], - POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl, + POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl, CORBA::NO_MEMORY () ); ACE_CHECK; break; - + + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_CORBA::_TAO_Policy_Direct_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], - CORBA_TAO_Policy_Remote_Proxy_Impl, + ::CORBA::_TAO_Policy_Remote_Proxy_Impl, CORBA::NO_MEMORY () ); ACE_CHECK; break; - + } - + } } @@ -595,44 +603,44 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::create_proxy ( /////////////////////////////////////////////////////////////////////// -CORBA_TAO_Policy_Proxy_Broker * -CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) +CORBA::_TAO_Policy_Proxy_Broker * +CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) { ACE_UNUSED_ARG (obj); - return ::POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker(); + return ::POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker(); } int -CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_Initializer (long) +CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (long) { - CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer = - CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function; - + CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer = + CORBA__TAO_Policy_Proxy_Broker_Factory_function; + return 0; } -static int CORBA_CORBA_TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_Initializer)); +static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = + CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer)); /////////////////////////////////////////////////////////////////////// // ThruPOA Proxy Implementation // -POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl (void) +POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_TAO_Policy_ThruPOA_Proxy_Impl (void) {} // ThruPOA Implementation of the IDL interface methods -CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( - CORBA::Object_ptr _collocated_tao_target_ +CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::PolicyType _tao_retval = 0; + CORBA::PolicyType _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); TAO_Object_Adapter::Servant_Upcall servant_upcall ( _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () @@ -644,9 +652,9 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( forward_to.out () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (_tao_retval); - return ACE_reinterpret_cast ( - POA_CORBA_Policy_ptr, + ACE_CHECK_RETURN (_tao_retval); + return ACE_reinterpret_cast ( + POA_CORBA::Policy_ptr, servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA/Policy:1.0" ) @@ -655,15 +663,15 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( ); } -CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( - CORBA::Object_ptr _collocated_tao_target_ +::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::Policy_var _tao_retval; + ::CORBA::Policy_var _tao_retval; ACE_UNUSED_ARG (_tao_retval); TAO_Object_Adapter::Servant_Upcall servant_upcall ( _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () @@ -675,9 +683,9 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( forward_to.out () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_CORBA_Policy_ptr, + ACE_CHECK_RETURN (_tao_retval._retn ()); + return ACE_reinterpret_cast ( + POA_CORBA::Policy_ptr, servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA/Policy:1.0" ) @@ -686,8 +694,8 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( ); } -void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( - CORBA::Object_ptr _collocated_tao_target_ +void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( @@ -705,8 +713,8 @@ void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( ACE_ENV_ARG_PARAMETER ); ACE_CHECK; - ACE_reinterpret_cast ( - POA_CORBA_Policy_ptr, + ACE_reinterpret_cast ( + POA_CORBA::Policy_ptr, servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA/Policy:1.0" ) @@ -720,145 +728,151 @@ void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( // End ThruPOA Proxy Implementation /////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////// // Direct Proxy Implementation // -_TAO_CORBA_Policy_Direct_Proxy_Impl::_TAO_CORBA_Policy_Direct_Proxy_Impl (void) +POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void) {} -CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type ( - CORBA::Object_ptr _collocated_tao_target_ +CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL - ) + ) ACE_THROW_SPEC (( - CORBA::SystemException - )) + CORBA::SystemException + )) { return ACE_reinterpret_cast ( - POA_CORBA_Policy_ptr, - _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") - )->policy_type ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - + POA_CORBA::Policy_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") + )->policy_type ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); + } -CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy ( - CORBA::Object_ptr _collocated_tao_target_ +::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL - ) + ) ACE_THROW_SPEC (( - CORBA::SystemException - )) + CORBA::SystemException + )) { return ACE_reinterpret_cast ( - POA_CORBA_Policy_ptr, - _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") - )->copy ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - + POA_CORBA::Policy_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") + )->copy ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); + } -void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy ( - CORBA::Object_ptr _collocated_tao_target_ - ACE_ENV_ARG_DECL - ) +void POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy ( + CORBA_Object *_collocated_tao_target_ + ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( - CORBA::SystemException - )) + CORBA::SystemException + )) { ACE_reinterpret_cast ( - POA_CORBA_Policy_ptr, - _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") + POA_CORBA::Policy_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") )->destroy ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - + ACE_ENV_SINGLE_ARG_PARAMETER + ); + } // // End Direct Proxy Implementation /////////////////////////////////////////////////////////////////////// - -// skeleton constructor -POA_CORBA_Policy::POA_CORBA_Policy (void) +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_ss.cpp:100 +POA_CORBA::Policy::Policy (void) { this->optable_ = &tao_CORBA_Policy_optable; } -// copy ctor -POA_CORBA_Policy::POA_CORBA_Policy (const POA_CORBA_Policy& rhs) - : TAO_ServantBase (rhs) +POA_CORBA::Policy::Policy (const Policy& rhs) + : TAO_ServantBase (rhs) {} -// skeleton destructor -POA_CORBA_Policy::~POA_CORBA_Policy (void) +POA_CORBA::Policy::~Policy (void) { } -void POA_CORBA_Policy::_get_policy_type_skel ( +void POA_CORBA::Policy::_get_policy_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall ACE_ENV_ARG_DECL ) { - POA_CORBA_Policy *_tao_impl = - ACE_static_cast (POA_CORBA_Policy *, _tao_object_reference); + POA_CORBA::Policy *_tao_impl = + ACE_static_cast ( + POA_CORBA::Policy *, + _tao_object_reference + ); + CORBA::PolicyType _tao_retval = 0; +#if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - - CORBA::PolicyType _tao_retval = 0; - -#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_CORBA_Policy_policy_type_get ri ( + + TAO_ServerRequestInfo_CORBA_Policy_policy_type_get _tao_ri ( _tao_server_request, _tao_upcall, - _tao_impl - ACE_ENV_ARG_PARAMETER + _tao_impl ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = - _tao_impl->policy_type ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + _tao_retval = + _tao_impl->policy_type ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) + } + CORBA::PolicyType _tao_retval_info = _tao_retval; - ri.result (_tao_retval_info); - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + _tao_ri.result (_tao_retval_info); + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -866,80 +880,89 @@ void POA_CORBA_Policy::_get_policy_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL()); +ACE_THROW (CORBA::MARSHAL ()); - ACE_UNUSED_ARG (_tao_upcall); -} + // In case _tao_servant_upcall is not used in this function + ACE_UNUSED_ARG (_tao_servant_upcall); + + } -void POA_CORBA_Policy::copy_skel ( +void POA_CORBA::Policy::copy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall ACE_ENV_ARG_DECL ) { - POA_CORBA_Policy *_tao_impl = - ACE_static_cast (POA_CORBA_Policy *, _tao_object_reference); + POA_CORBA::Policy *_tao_impl = + ACE_static_cast ( + POA_CORBA::Policy *, + _tao_object_reference + ); + ::CORBA::Policy_var _tao_retval; +#if (TAO_HAS_INTERCEPTORS == 1) TAO_Object_Adapter::Servant_Upcall *_tao_upcall = ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - - CORBA::Policy_var _tao_retval; - -#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_CORBA_Policy_copy ri ( + + TAO_ServerRequestInfo_CORBA_Policy_copy _tao_ri ( _tao_server_request, _tao_upcall, - _tao_impl - ACE_ENV_ARG_PARAMETER + _tao_impl ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = - _tao_impl->copy ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + _tao_retval = + _tao_impl->copy ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn (); - ri.result (_tao_retval_info); + } + + ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn (); + _tao_ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -947,78 +970,86 @@ void POA_CORBA_Policy::copy_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL()); - - ACE_UNUSED_ARG (_tao_upcall); +ACE_THROW (CORBA::MARSHAL ()); -} + // In case _tao_servant_upcall is not used in this function + ACE_UNUSED_ARG (_tao_servant_upcall); + + } -void POA_CORBA_Policy::destroy_skel ( +void POA_CORBA::Policy::destroy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall ACE_ENV_ARG_DECL ) { - POA_CORBA_Policy *_tao_impl = - ACE_static_cast (POA_CORBA_Policy *, _tao_object_reference); - - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = - ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); - + POA_CORBA::Policy *_tao_impl = + ACE_static_cast ( + POA_CORBA::Policy *, + _tao_object_reference + ); _tao_server_request.argument_flag (0); - + #if (TAO_HAS_INTERCEPTORS == 1) + TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall); + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - - TAO_ServerRequestInfo_CORBA_Policy_destroy ri ( + + TAO_ServerRequestInfo_CORBA_Policy_destroy _tao_ri ( _tao_server_request, _tao_upcall, - _tao_impl - ACE_ENV_ARG_PARAMETER + _tao_impl ACE_ENV_ARG_PARAMETER ); - + ACE_TRY { - _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + { + TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (), + 1 /* Copy TSC to RSC */); + + _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->destroy ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - + + _tao_impl->destroy ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; + #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); + } + + _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ri.exception (&ACE_ANY_EXCEPTION); + _tao_ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri + &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -1026,83 +1057,86 @@ void POA_CORBA_Policy::destroy_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); + + // In case _tao_servant_upcall is not used in this function + ACE_UNUSED_ARG (_tao_servant_upcall); + + } - ACE_UNUSED_ARG (_tao_upcall); - -} - -void POA_CORBA_Policy::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, +void POA_CORBA::Policy::_is_a_skel ( + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference; + POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference; CORBA::Boolean _tao_retval = 0; CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER); + + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) ACE_THROW (CORBA::MARSHAL ()); } -void POA_CORBA_Policy::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, +void POA_CORBA::Policy::_non_existent_skel ( + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { - POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference; + CORBA::Boolean _tao_retval = + _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) ACE_THROW (CORBA::MARSHAL ()); } -void POA_CORBA_Policy::_interface_skel ( - TAO_ServerRequest &_tao_server_request, +void POA_CORBA::Policy::_interface_skel ( + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ ACE_ENV_ARG_DECL ) { - POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference; + POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { - _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = + _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -1114,21 +1148,19 @@ void POA_CORBA_Policy::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); } } -CORBA::Boolean POA_CORBA_Policy::_is_a ( +CORBA::Boolean POA_CORBA::Policy::_is_a ( const char* value - ACE_ENV_ARG_DECL + ACE_ENV_ARG_DECL_NOT_USED ) { - const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - + const char *base_id = "IDL:org.omg/CORBA/Object:1.0"; if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) @@ -1137,18 +1169,27 @@ CORBA::Boolean POA_CORBA_Policy::_is_a ( return 0; } -void* POA_CORBA_Policy::_downcast ( +void* POA_CORBA::Policy::_downcast ( const char* logical_type_id ) { if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA_Policy_ptr, this); + return ACE_static_cast (POA_CORBA::Policy_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); return 0; } -void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) +const char* POA_CORBA::Policy::_interface_repository_id (void) const +{ + return "IDL:omg.org/CORBA/Policy:1.0"; +} + +void POA_CORBA::Policy::_dispatch ( + TAO_ServerRequest &req, + void *servant_upcall + ACE_ENV_ARG_DECL + ) { this->synchronous_upcall_dispatch (req, servant_upcall, @@ -1156,30 +1197,26 @@ void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall A ACE_ENV_ARG_PARAMETER); } -const char* POA_CORBA_Policy::_interface_repository_id (void) const -{ - return "IDL:omg.org/CORBA/Policy:1.0"; -} CORBA::Policy* -POA_CORBA_Policy::_this (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL) { TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + TAO_Stub_Auto_Ptr safe_stub (stub); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA::Policy::_unchecked_narrow (obj.in ()); } diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 1537f13465c..52b2c7350e2 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_CORBA_POLICYS_H_ -#define _TAO_IDL_CORBA_POLICYS_H_ +#ifndef _TAO_IDL_ORIG_POLICYS_H_ +#define _TAO_IDL_ORIG_POLICYS_H_ #include "ace/pre.h" #include "tao/PolicyC.h" @@ -35,6 +35,7 @@ #include "tao/PortableServer/Collocated_Object.h" #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h" #include "tao/PortableServer/Direct_Object_Proxy_Impl.h" + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -46,26 +47,30 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ - class POA_CORBA_Policy; - typedef POA_CORBA_Policy *POA_CORBA_Policy_ptr; +TAO_NAMESPACE POA_CORBA +{ + class Policy; + typedef Policy *Policy_ptr; // Forward Classes Declaration - class POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl; - class POA_CORBA_TAO_Policy_Strategized_Proxy_Broker; - - class TAO_PortableServer_Export POA_CORBA_Policy : public virtual PortableServer::ServantBase + class _TAO_Policy_ThruPOA_Proxy_Impl; + class _TAO_Policy_Direct_Proxy_Impl; + class _TAO_Policy_Strategized_Proxy_Broker; + + class TAO_Export Policy + : public virtual PortableServer::ServantBase { protected: - POA_CORBA_Policy (void); + Policy (void); public: - POA_CORBA_Policy (const POA_CORBA_Policy& rhs); - virtual ~POA_CORBA_Policy (void); + Policy (const Policy& rhs); + virtual ~Policy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); virtual void* _downcast ( const char* logical_type_id @@ -99,33 +104,35 @@ ); ::CORBA::Policy *_this ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); virtual const char* _interface_repository_id (void) const; virtual CORBA::PolicyType policy_type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - static void _get_policy_type_skel ( + + static void _get_policy_type_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - virtual CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + virtual ::CORBA::Policy_ptr copy ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - static void copy_skel ( + + static void copy_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall @@ -133,13 +140,14 @@ ); virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - static void destroy_skel ( + + static void destroy_skel ( TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall @@ -149,23 +157,23 @@ }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - - class TAO_PortableServer_Export POA_CORBA_TAO_Policy_Strategized_Proxy_Broker : public virtual CORBA_TAO_Policy_Proxy_Broker + + class TAO_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker { - public: - POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void); - - virtual ~POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void); - - virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( + public: + _TAO_Policy_Strategized_Proxy_Broker (void); + + virtual ~_TAO_Policy_Strategized_Proxy_Broker (void); + + virtual ::CORBA::_TAO_Policy_Proxy_Impl &select_proxy ( ::CORBA::Policy *object ACE_ENV_ARG_DECL ); - + private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. @@ -173,115 +181,121 @@ int collocation_strategy ACE_ENV_ARG_DECL ); - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. - CORBA_TAO_Policy_Proxy_Impl + ::CORBA::_TAO_Policy_Proxy_Impl *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; - + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. - + public: - static POA_CORBA_TAO_Policy_Strategized_Proxy_Broker *the_TAO_Policy_Strategized_Proxy_Broker (void); + static _TAO_Policy_Strategized_Proxy_Broker *the_TAO_Policy_Strategized_Proxy_Broker (void); }; - - + + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // ThruPOA Impl. Declaration // - - class TAO_PortableServer_Export POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl : - public virtual CORBA_TAO_Policy_Proxy_Impl, + + class TAO_Export _TAO_Policy_ThruPOA_Proxy_Impl : + public virtual ::CORBA::_TAO_Policy_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl { public: - POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl (void); - - virtual ~POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl (void) { } - + _TAO_Policy_ThruPOA_Proxy_Impl (void); + + virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) { } + virtual CORBA::PolicyType policy_type ( - CORBA::Object_ptr _collocated_tao_target_ + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - -virtual CORBA::Policy_ptr copy ( - CORBA::Object_ptr _collocated_tao_target_ + + virtual ::CORBA::Policy_ptr copy ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - -virtual void destroy ( - CORBA::Object_ptr _collocated_tao_target_ + + virtual void destroy ( + CORBA_Object *_collocated_tao_target_ ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - - + + }; - + // // ThruPOA Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - + + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // -class TAO_PortableServer_Export _TAO_CORBA_Policy_Direct_Proxy_Impl : - public virtual CORBA_TAO_Policy_Proxy_Impl, +class TAO_Export _TAO_Policy_Direct_Proxy_Impl : + public virtual CORBA::_TAO_Policy_Proxy_Impl, public virtual TAO_Direct_Object_Proxy_Impl { public: - _TAO_CORBA_Policy_Direct_Proxy_Impl (void); - - virtual ~_TAO_CORBA_Policy_Direct_Proxy_Impl (void) { } - + _TAO_Policy_Direct_Proxy_Impl (void); + + virtual ~_TAO_Policy_Direct_Proxy_Impl (void) { } + virtual CORBA::PolicyType policy_type ( - CORBA::Object_ptr _collocated_tao_target_ - ACE_ENV_ARG_DECL - ) + CORBA_Object *_collocated_tao_target_ + ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual CORBA_Policy_ptr copy ( - CORBA::Object_ptr _collocated_tao_target_ - ACE_ENV_ARG_DECL - ) + CORBA::SystemException + )); + + virtual ::CORBA::Policy_ptr copy ( + CORBA_Object *_collocated_tao_target_ + ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void destroy ( - CORBA::Object_ptr _collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CORBA::SystemException + )); + + virtual void destroy ( + CORBA_Object *_collocated_tao_target_ + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + }; -}; // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// + +} +TAO_NAMESPACE_CLOSE // module CORBA + #include "PolicyS_T.h" #if defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp index 003f99fca75..9e19877a5df 100644 --- a/TAO/tao/PortableServer/PolicyS_T.cpp +++ b/TAO/tao/PortableServer/PolicyS_T.cpp @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_POLICYS_T_CPP_ -#define _TAO_IDL_POLICYS_T_CPP_ +#ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_ +#define _TAO_IDL_ORIG_POLICYS_T_CPP_ #include "PolicyS_T.h" diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index 39647c49710..77267c3bca7 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_CORBA_POLICYS_T_H_ -#define _TAO_IDL_CORBA_POLICYS_T_H_ +#ifndef _TAO_IDL_ORIG_POLICYS_T_H_ +#define _TAO_IDL_ORIG_POLICYS_T_H_ #include "ace/pre.h" #if defined(_MSC_VER) @@ -31,23 +31,24 @@ #endif /* _MSC_VER */ #if defined (ACE_HAS_USING_KEYWORD) - +TAO_NAMESPACE POA_CORBA +{ // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> - class TAO_PortableServer_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy + class TAO_Export Policy_tie : public Policy { public: - POA_CORBA_Policy_tie (T &t); + Policy_tie (T &t); // the T& ctor - POA_CORBA_Policy_tie (T &t, PortableServer::POA_ptr poa); + Policy_tie (T &t, PortableServer::POA_ptr poa); // ctor taking a POA - POA_CORBA_Policy_tie (T *tp, CORBA::Boolean release=1); + Policy_tie (T *tp, CORBA::Boolean release=1); // ctor taking pointer and an ownership flag - POA_CORBA_Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); + Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); // ctor with T*, ownership flag and a POA - ~POA_CORBA_Policy_tie (void); + ~Policy_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -59,42 +60,47 @@ // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ); CORBA::PolicyType policy_type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - CORBA::Policy_ptr copy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + ::CORBA::Policy_ptr copy ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - + + void destroy ( + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )); - - private: + + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed - POA_CORBA_Policy_tie (const POA_CORBA_Policy_tie &); - void operator= (const POA_CORBA_Policy_tie &); + Policy_tie (const Policy_tie &); + void operator= (const Policy_tie &); }; +} +TAO_NAMESPACE_CLOSE // module CORBA #endif /* ACE_HAS_USING_KEYWORD */ #if defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i index 2598ef6287b..79e549871da 100644 --- a/TAO/tao/PortableServer/PolicyS_T.i +++ b/TAO/tao/PortableServer/PolicyS_T.i @@ -22,47 +22,47 @@ #if defined (ACE_HAS_USING_KEYWORD) template <class T> ACE_INLINE -POA_CORBA_Policy_tie<T>::POA_CORBA_Policy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) +POA_CORBA::Policy_tie<T>::Policy_tie (T &t) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE -POA_CORBA_Policy_tie<T>::POA_CORBA_Policy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) +POA_CORBA::Policy_tie<T>::Policy_tie (T &t, PortableServer::POA_ptr poa) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE -POA_CORBA_Policy_tie<T>::POA_CORBA_Policy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) +POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, CORBA::Boolean release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE -POA_CORBA_Policy_tie<T>::POA_CORBA_Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) +POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE -POA_CORBA_Policy_tie<T>::~POA_CORBA_Policy_tie (void) +POA_CORBA::Policy_tie<T>::~Policy_tie (void) { if (this->rel_) delete this->ptr_; } template <class T> ACE_INLINE T * -POA_CORBA_Policy_tie<T>::_tied_object (void) +POA_CORBA::Policy_tie<T>::_tied_object (void) { return this->ptr_; } template <class T> ACE_INLINE void -POA_CORBA_Policy_tie<T>::_tied_object (T &obj) +POA_CORBA::Policy_tie<T>::_tied_object (T &obj) { if (this->rel_) delete this->ptr_; this->ptr_ = &obj; @@ -70,7 +70,7 @@ POA_CORBA_Policy_tie<T>::_tied_object (T &obj) } template <class T> ACE_INLINE void -POA_CORBA_Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release) +POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release) { if (this->rel_) delete this->ptr_; this->ptr_ = obj; @@ -78,28 +78,29 @@ POA_CORBA_Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release) } template <class T> ACE_INLINE CORBA::Boolean -POA_CORBA_Policy_tie<T>::_is_owner (void) +POA_CORBA::Policy_tie<T>::_is_owner (void) { return this->rel_; } template <class T> ACE_INLINE void -POA_CORBA_Policy_tie<T>::_is_owner (CORBA::Boolean b) +POA_CORBA::Policy_tie<T>::_is_owner (CORBA::Boolean b) { this->rel_ = b; } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) +POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE -CORBA::PolicyType POA_CORBA_Policy_tie<T>::policy_type ( +CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -112,7 +113,8 @@ ACE_ENV_SINGLE_ARG_PARAMETER } template <class T> ACE_INLINE -CORBA::Policy_ptr POA_CORBA_Policy_tie<T>::copy ( +::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -125,7 +127,8 @@ ACE_ENV_SINGLE_ARG_PARAMETER } template <class T> ACE_INLINE -void POA_CORBA_Policy_tie<T>::destroy ( +void POA_CORBA::Policy_tie<T>::destroy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -138,3 +141,4 @@ ACE_ENV_SINGLE_ARG_PARAMETER } #endif /* ACE_HAS_USING_KEYWORD */ + diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl index 180e4be7ab2..4612d90c57a 100644 --- a/TAO/tao/PortableServer/PortableServer.pidl +++ b/TAO/tao/PortableServer/PortableServer.pidl @@ -1,64 +1,52 @@ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// PortableServer.pidl -// -// = DESCRIPTION -// -// This file was used to generate the code in PortableServerC.{h,i,cpp} -// -// The command used to generate code from this file is: -// -// tao_idl.exe \ -// -Ge 1 \ -// -Wb,export_macro=TAO_PortableServer_Export \ -// -Wb,export_include="tao/corbafwd.h" \ -// -Wb,pre_include="ace/pre.h" \ -// -Wb,post_include="ace/post.h" \ -// PortableServer.pidl -// -// After the file is generated a patch from the diffs directory must -// be applied. The patch: -// -// - Disables parts of the code under certain configurations. -// -// - Eliminates cycles in the include dependencies. -// -// - Removes the extra environment option for (a) incarnate (b) -// etherealize (c) preinvoke and (d) postinvoke -// -// - Adds non-idl components of PortableServer to the namespace. -// This includes (a) Servant (b) ServantBase (c) RefCountServantBase -// (d) Cookie (e) ObjectId_to_string (f) string_to_ObjectId (g) -// ObjectId_to_wstring (h) wstring_to_ObjectId (i) ServantBase_var -// (j) DynamicImplementation (k) LocalServantBase -// -// Apply patches using the following commands: -// -// patch < diffs\PortableServerC.h.diff -// patch < diffs\PortableServerC.i.diff -// patch < diffs\PortableServerC.cpp.diff - -// Note: The diffs were generated with these commands: -// -// diff -wub PortableServerC.h PortableServerC.h.mod > diffs\PortableServerC.h.diff -// diff -wub PortableServerC.i PortableServerC.i.mod > diffs\PortableServerC.i.diff -// diff -wub PortableServerC.cpp PortableServerC.cpp.mod > diffs\PortableServerC.cpp.diff -// -// ================================================================ +/** + * @file PortableServer.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the PortableServer module. + * + * This file was used to generate the code in + * PortableServerC.{h,i,cpp}, using the following command: + * + * tao_idl.exe \ + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_PortableServer_Export \ + * -Wb,export_include="tao/corbafwd.h" \ + * -Wb,pre_include="ace/pre.h" \ + * -Wb,post_include="ace/post.h" \ + * PortableServer.pidl + * + * After the file is generated a patch from the diffs directory must + * be applied. The patch: + * + * - Disables parts of the code under certain configurations. + * + * - Eliminates cycles in the include dependencies. + * + * - Adds non-idl components of PortableServer to the namespace. + * This includes (a) Servant (b) ServantBase (c) RefCountServantBase + * (d) Cookie (e) ObjectId_to_string (f) string_to_ObjectId (g) + * ObjectId_to_wstring (h) wstring_to_ObjectId (i) ServantBase_var + * (j) DynamicImplementation (k) LocalServantBase + * + * Apply patches using the following command: + * + * patch < diffs/PortableServer.diff + * + * Note: The diffs were generated using: + * + * for i in PortableServerC.{h,i,cpp}; do + * diff -wub orig/$i $i > diffs/PortableServer.diff + * done + */ #ifndef _PORTABLESERVER_IDL_ #define _PORTABLESERVER_IDL_ -#pragma prefix "omg.org" - #include <orb.idl> +#include <Current.pidl> + +#pragma prefix "omg.org" module PortableServer { # pragma version PortableServer 2.3 @@ -298,11 +286,11 @@ module PortableServer { IDs reference_to_ids(in Object the_ref) raises (NotAGroupObject); - void associate_reference_with_id (in Object ref, + void associate_reference_with_id (in Object ref, in ObjectId oid) raises (NotAGroupObject); - - void disassociate_reference_with_id (in Object ref, + + void disassociate_reference_with_id (in Object ref, in ObjectId oid) raises (NotAGroupObject); @@ -317,4 +305,5 @@ module PortableServer { ObjectId get_object_id() raises (NoContext); }; }; + #endif // _PORTABLESERVER_IDL_ diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index ea2636d8d50..d857fa7566d 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -20,9 +20,18 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "PortableServerC.h" + +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + #include "POA.h" -#include "tao/ORB.h" -#include "tao/ORB_Core.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -32,6 +41,29 @@ #include "PortableServerC.i" #endif /* !defined INLINE */ +char * +PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id) +{ + return TAO_POA::ObjectId_to_string (id); +} + +CORBA::WChar * +PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id) +{ + return TAO_POA::ObjectId_to_wstring (id); +} + +PortableServer::ObjectId * +PortableServer::string_to_ObjectId (const char *id) +{ + return TAO_POA::string_to_ObjectId (id); +} + +PortableServer::ObjectId * +PortableServer::wstring_to_ObjectId (const CORBA::WChar *id) +{ + return TAO_POA::wstring_to_ObjectId (id); +} #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -274,12 +306,6 @@ PortableServer::ForwardRequest::~ForwardRequest (void) { } -void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer) -{ - ForwardRequest *tmp = ACE_static_cast (ForwardRequest*, _tao_void_pointer); - delete tmp; -} - // Copy constructor. PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -296,7 +322,12 @@ PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardReques return *this; } -// Narrow. +void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer) +{ + ForwardRequest *tmp = ACE_static_cast (ForwardRequest*, _tao_void_pointer); + delete tmp; +} + PortableServer::ForwardRequest * PortableServer::ForwardRequest::_downcast (CORBA::Exception *exc) { @@ -310,6 +341,25 @@ PortableServer::ForwardRequest::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::ForwardRequest::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::ForwardRequest, 0); + return retval; +} + +CORBA::Exception * +PortableServer::ForwardRequest::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::ForwardRequest (*this), + 0 + ); + return result; +} + void PortableServer::ForwardRequest::_raise () { TAO_RAISE (*this); @@ -341,14 +391,6 @@ void PortableServer::ForwardRequest::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::ForwardRequest::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::ForwardRequest, 0); - return retval; -} - PortableServer::ForwardRequest::ForwardRequest ( const CORBA::Object_ptr _tao_forward_reference ) @@ -438,12 +480,6 @@ PortableServer::NotAGroupObject::~NotAGroupObject (void) { } -void PortableServer::NotAGroupObject::_tao_any_destructor (void *_tao_void_pointer) -{ - NotAGroupObject *tmp = ACE_static_cast (NotAGroupObject*, _tao_void_pointer); - delete tmp; -} - // Copy constructor. PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp) : CORBA_UserException (_tao_excp._id ()) @@ -458,7 +494,12 @@ PortableServer::NotAGroupObject::operator= (const ::PortableServer::NotAGroupObj return *this; } -// Narrow. +void PortableServer::NotAGroupObject::_tao_any_destructor (void *_tao_void_pointer) +{ + NotAGroupObject *tmp = ACE_static_cast (NotAGroupObject*, _tao_void_pointer); + delete tmp; +} + PortableServer::NotAGroupObject * PortableServer::NotAGroupObject::_downcast (CORBA::Exception *exc) { @@ -472,6 +513,25 @@ PortableServer::NotAGroupObject::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::NotAGroupObject::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::NotAGroupObject, 0); + return retval; +} + +CORBA::Exception * +PortableServer::NotAGroupObject::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::NotAGroupObject (*this), + 0 + ); + return result; +} + void PortableServer::NotAGroupObject::_raise () { TAO_RAISE (*this); @@ -503,14 +563,6 @@ void PortableServer::NotAGroupObject::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::NotAGroupObject::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::NotAGroupObject, 0); - return retval; -} - static const CORBA::Long _oc_PortableServer_NotAGroupObject[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -797,8 +849,53 @@ TAO_NAMESPACE_END int PortableServer::ThreadPolicy::_tao_class_id = 0; +PortableServer::ThreadPolicy_ptr +tao_PortableServer_ThreadPolicy_duplicate ( + PortableServer::ThreadPolicy_ptr p + ) +{ + return PortableServer::ThreadPolicy::_duplicate (p); +} + +void +tao_PortableServer_ThreadPolicy_release ( + PortableServer::ThreadPolicy_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::ThreadPolicy_ptr +tao_PortableServer_ThreadPolicy_nil ( + void + ) +{ + return PortableServer::ThreadPolicy::_nil (); +} + +PortableServer::ThreadPolicy_ptr +tao_PortableServer_ThreadPolicy_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_ThreadPolicy_upcast ( + void *src + ) +{ + PortableServer::ThreadPolicy **tmp = + ACE_static_cast (PortableServer::ThreadPolicy **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::ThreadPolicy_var +// PortableServer::ThreadPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::ThreadPolicy_var::ThreadPolicy_var (void) // default constructor @@ -921,7 +1018,9 @@ PortableServer::ThreadPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::ThreadPolicy_out +// PortableServer::ThreadPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p) @@ -980,41 +1079,44 @@ PortableServer::ThreadPolicy_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::ThreadPolicy::ThreadPolicy (void) {} - // destructor - PortableServer::ThreadPolicy::~ThreadPolicy (void) - {} - - PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ThreadPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ThreadPolicy::_nil (); - return - ACE_reinterpret_cast - ( - ThreadPolicy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ThreadPolicy::_tao_class_id - ) - ) - ); +PortableServer::ThreadPolicy::~ThreadPolicy (void) +{} + +PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ThreadPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::ThreadPolicy_ptr +PortableServer::ThreadPolicy::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ThreadPolicy::_nil (); + return + ACE_reinterpret_cast + ( + ThreadPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ThreadPolicy::_tao_class_id + ) + ) + ); } PortableServer::ThreadPolicy_ptr @@ -1109,8 +1211,53 @@ TAO_NAMESPACE_END int PortableServer::LifespanPolicy::_tao_class_id = 0; +PortableServer::LifespanPolicy_ptr +tao_PortableServer_LifespanPolicy_duplicate ( + PortableServer::LifespanPolicy_ptr p + ) +{ + return PortableServer::LifespanPolicy::_duplicate (p); +} + +void +tao_PortableServer_LifespanPolicy_release ( + PortableServer::LifespanPolicy_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::LifespanPolicy_ptr +tao_PortableServer_LifespanPolicy_nil ( + void + ) +{ + return PortableServer::LifespanPolicy::_nil (); +} + +PortableServer::LifespanPolicy_ptr +tao_PortableServer_LifespanPolicy_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_LifespanPolicy_upcast ( + void *src + ) +{ + PortableServer::LifespanPolicy **tmp = + ACE_static_cast (PortableServer::LifespanPolicy **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::LifespanPolicy_var +// PortableServer::LifespanPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::LifespanPolicy_var::LifespanPolicy_var (void) // default constructor @@ -1233,7 +1380,9 @@ PortableServer::LifespanPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::LifespanPolicy_out +// PortableServer::LifespanPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p) @@ -1292,41 +1441,44 @@ PortableServer::LifespanPolicy_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::LifespanPolicy::LifespanPolicy (void) {} - // destructor - PortableServer::LifespanPolicy::~LifespanPolicy (void) - {} - - PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return LifespanPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return LifespanPolicy::_nil (); - return - ACE_reinterpret_cast - ( - LifespanPolicy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &LifespanPolicy::_tao_class_id - ) - ) - ); +PortableServer::LifespanPolicy::~LifespanPolicy (void) +{} + +PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return LifespanPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::LifespanPolicy_ptr +PortableServer::LifespanPolicy::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return LifespanPolicy::_nil (); + return + ACE_reinterpret_cast + ( + LifespanPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &LifespanPolicy::_tao_class_id + ) + ) + ); } PortableServer::LifespanPolicy_ptr @@ -1421,8 +1573,53 @@ TAO_NAMESPACE_END int PortableServer::IdUniquenessPolicy::_tao_class_id = 0; +PortableServer::IdUniquenessPolicy_ptr +tao_PortableServer_IdUniquenessPolicy_duplicate ( + PortableServer::IdUniquenessPolicy_ptr p + ) +{ + return PortableServer::IdUniquenessPolicy::_duplicate (p); +} + +void +tao_PortableServer_IdUniquenessPolicy_release ( + PortableServer::IdUniquenessPolicy_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::IdUniquenessPolicy_ptr +tao_PortableServer_IdUniquenessPolicy_nil ( + void + ) +{ + return PortableServer::IdUniquenessPolicy::_nil (); +} + +PortableServer::IdUniquenessPolicy_ptr +tao_PortableServer_IdUniquenessPolicy_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_IdUniquenessPolicy_upcast ( + void *src + ) +{ + PortableServer::IdUniquenessPolicy **tmp = + ACE_static_cast (PortableServer::IdUniquenessPolicy **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::IdUniquenessPolicy_var +// PortableServer::IdUniquenessPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void) // default constructor @@ -1545,7 +1742,9 @@ PortableServer::IdUniquenessPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::IdUniquenessPolicy_out +// PortableServer::IdUniquenessPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &p) @@ -1604,41 +1803,44 @@ PortableServer::IdUniquenessPolicy_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void) {} - // destructor - PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void) - {} - - PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return IdUniquenessPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return IdUniquenessPolicy::_nil (); - return - ACE_reinterpret_cast - ( - IdUniquenessPolicy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &IdUniquenessPolicy::_tao_class_id - ) - ) - ); +PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void) +{} + +PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return IdUniquenessPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::IdUniquenessPolicy_ptr +PortableServer::IdUniquenessPolicy::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return IdUniquenessPolicy::_nil (); + return + ACE_reinterpret_cast + ( + IdUniquenessPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &IdUniquenessPolicy::_tao_class_id + ) + ) + ); } PortableServer::IdUniquenessPolicy_ptr @@ -1732,8 +1934,53 @@ TAO_NAMESPACE_END int PortableServer::IdAssignmentPolicy::_tao_class_id = 0; +PortableServer::IdAssignmentPolicy_ptr +tao_PortableServer_IdAssignmentPolicy_duplicate ( + PortableServer::IdAssignmentPolicy_ptr p + ) +{ + return PortableServer::IdAssignmentPolicy::_duplicate (p); +} + +void +tao_PortableServer_IdAssignmentPolicy_release ( + PortableServer::IdAssignmentPolicy_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::IdAssignmentPolicy_ptr +tao_PortableServer_IdAssignmentPolicy_nil ( + void + ) +{ + return PortableServer::IdAssignmentPolicy::_nil (); +} + +PortableServer::IdAssignmentPolicy_ptr +tao_PortableServer_IdAssignmentPolicy_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_IdAssignmentPolicy_upcast ( + void *src + ) +{ + PortableServer::IdAssignmentPolicy **tmp = + ACE_static_cast (PortableServer::IdAssignmentPolicy **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::IdAssignmentPolicy_var +// PortableServer::IdAssignmentPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void) // default constructor @@ -1856,7 +2103,9 @@ PortableServer::IdAssignmentPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::IdAssignmentPolicy_out +// PortableServer::IdAssignmentPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &p) @@ -1915,41 +2164,44 @@ PortableServer::IdAssignmentPolicy_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void) {} - // destructor - PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void) - {} - - PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return IdAssignmentPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return IdAssignmentPolicy::_nil (); - return - ACE_reinterpret_cast - ( - IdAssignmentPolicy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &IdAssignmentPolicy::_tao_class_id - ) - ) - ); +PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void) +{} + +PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return IdAssignmentPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::IdAssignmentPolicy_ptr +PortableServer::IdAssignmentPolicy::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return IdAssignmentPolicy::_nil (); + return + ACE_reinterpret_cast + ( + IdAssignmentPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &IdAssignmentPolicy::_tao_class_id + ) + ) + ); } PortableServer::IdAssignmentPolicy_ptr @@ -2055,8 +2307,53 @@ TAO_NAMESPACE_END int PortableServer::ImplicitActivationPolicy::_tao_class_id = 0; +PortableServer::ImplicitActivationPolicy_ptr +tao_PortableServer_ImplicitActivationPolicy_duplicate ( + PortableServer::ImplicitActivationPolicy_ptr p + ) +{ + return PortableServer::ImplicitActivationPolicy::_duplicate (p); +} + +void +tao_PortableServer_ImplicitActivationPolicy_release ( + PortableServer::ImplicitActivationPolicy_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::ImplicitActivationPolicy_ptr +tao_PortableServer_ImplicitActivationPolicy_nil ( + void + ) +{ + return PortableServer::ImplicitActivationPolicy::_nil (); +} + +PortableServer::ImplicitActivationPolicy_ptr +tao_PortableServer_ImplicitActivationPolicy_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_ImplicitActivationPolicy_upcast ( + void *src + ) +{ + PortableServer::ImplicitActivationPolicy **tmp = + ACE_static_cast (PortableServer::ImplicitActivationPolicy **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::ImplicitActivationPolicy_var +// PortableServer::ImplicitActivationPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void) // default constructor @@ -2179,7 +2476,9 @@ PortableServer::ImplicitActivationPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::ImplicitActivationPolicy_out +// PortableServer::ImplicitActivationPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &p) @@ -2238,41 +2537,44 @@ PortableServer::ImplicitActivationPolicy_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void) {} - // destructor - PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void) - {} - - PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ImplicitActivationPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ImplicitActivationPolicy::_nil (); - return - ACE_reinterpret_cast - ( - ImplicitActivationPolicy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ImplicitActivationPolicy::_tao_class_id - ) - ) - ); +PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void) +{} + +PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ImplicitActivationPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::ImplicitActivationPolicy_ptr +PortableServer::ImplicitActivationPolicy::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ImplicitActivationPolicy::_nil (); + return + ACE_reinterpret_cast + ( + ImplicitActivationPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ImplicitActivationPolicy::_tao_class_id + ) + ) + ); } PortableServer::ImplicitActivationPolicy_ptr @@ -2368,8 +2670,53 @@ TAO_NAMESPACE_END int PortableServer::ServantRetentionPolicy::_tao_class_id = 0; +PortableServer::ServantRetentionPolicy_ptr +tao_PortableServer_ServantRetentionPolicy_duplicate ( + PortableServer::ServantRetentionPolicy_ptr p + ) +{ + return PortableServer::ServantRetentionPolicy::_duplicate (p); +} + +void +tao_PortableServer_ServantRetentionPolicy_release ( + PortableServer::ServantRetentionPolicy_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::ServantRetentionPolicy_ptr +tao_PortableServer_ServantRetentionPolicy_nil ( + void + ) +{ + return PortableServer::ServantRetentionPolicy::_nil (); +} + +PortableServer::ServantRetentionPolicy_ptr +tao_PortableServer_ServantRetentionPolicy_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_ServantRetentionPolicy_upcast ( + void *src + ) +{ + PortableServer::ServantRetentionPolicy **tmp = + ACE_static_cast (PortableServer::ServantRetentionPolicy **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::ServantRetentionPolicy_var +// PortableServer::ServantRetentionPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void) // default constructor @@ -2492,7 +2839,9 @@ PortableServer::ServantRetentionPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::ServantRetentionPolicy_out +// PortableServer::ServantRetentionPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &p) @@ -2551,41 +2900,44 @@ PortableServer::ServantRetentionPolicy_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void) {} - // destructor - PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void) - {} - - PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ServantRetentionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ServantRetentionPolicy::_nil (); - return - ACE_reinterpret_cast - ( - ServantRetentionPolicy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ServantRetentionPolicy::_tao_class_id - ) - ) - ); +PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void) +{} + +PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ServantRetentionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::ServantRetentionPolicy_ptr +PortableServer::ServantRetentionPolicy::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ServantRetentionPolicy::_nil (); + return + ACE_reinterpret_cast + ( + ServantRetentionPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServantRetentionPolicy::_tao_class_id + ) + ) + ); } PortableServer::ServantRetentionPolicy_ptr @@ -2695,8 +3047,53 @@ TAO_NAMESPACE_END int PortableServer::RequestProcessingPolicy::_tao_class_id = 0; +PortableServer::RequestProcessingPolicy_ptr +tao_PortableServer_RequestProcessingPolicy_duplicate ( + PortableServer::RequestProcessingPolicy_ptr p + ) +{ + return PortableServer::RequestProcessingPolicy::_duplicate (p); +} + +void +tao_PortableServer_RequestProcessingPolicy_release ( + PortableServer::RequestProcessingPolicy_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::RequestProcessingPolicy_ptr +tao_PortableServer_RequestProcessingPolicy_nil ( + void + ) +{ + return PortableServer::RequestProcessingPolicy::_nil (); +} + +PortableServer::RequestProcessingPolicy_ptr +tao_PortableServer_RequestProcessingPolicy_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_RequestProcessingPolicy_upcast ( + void *src + ) +{ + PortableServer::RequestProcessingPolicy **tmp = + ACE_static_cast (PortableServer::RequestProcessingPolicy **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::RequestProcessingPolicy_var +// PortableServer::RequestProcessingPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void) // default constructor @@ -2819,7 +3216,9 @@ PortableServer::RequestProcessingPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::RequestProcessingPolicy_out +// PortableServer::RequestProcessingPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &p) @@ -2878,41 +3277,44 @@ PortableServer::RequestProcessingPolicy_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void) {} - // destructor - PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void) - {} - - PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return RequestProcessingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return RequestProcessingPolicy::_nil (); - return - ACE_reinterpret_cast - ( - RequestProcessingPolicy_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &RequestProcessingPolicy::_tao_class_id - ) - ) - ); +PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void) +{} + +PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return RequestProcessingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::RequestProcessingPolicy_ptr +PortableServer::RequestProcessingPolicy::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return RequestProcessingPolicy::_nil (); + return + ACE_reinterpret_cast + ( + RequestProcessingPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RequestProcessingPolicy::_tao_class_id + ) + ) + ); } PortableServer::RequestProcessingPolicy_ptr @@ -2960,8 +3362,53 @@ const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (v int PortableServer::POAManager::_tao_class_id = 0; +PortableServer::POAManager_ptr +tao_PortableServer_POAManager_duplicate ( + PortableServer::POAManager_ptr p + ) +{ + return PortableServer::POAManager::_duplicate (p); +} + +void +tao_PortableServer_POAManager_release ( + PortableServer::POAManager_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::POAManager_ptr +tao_PortableServer_POAManager_nil ( + void + ) +{ + return PortableServer::POAManager::_nil (); +} + +PortableServer::POAManager_ptr +tao_PortableServer_POAManager_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_POAManager_upcast ( + void *src + ) +{ + PortableServer::POAManager **tmp = + ACE_static_cast (PortableServer::POAManager **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::POAManager_var +// PortableServer::POAManager_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::POAManager_var::POAManager_var (void) // default constructor @@ -3084,7 +3531,9 @@ PortableServer::POAManager_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::POAManager_out +// PortableServer::POAManager_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p) @@ -3143,41 +3592,44 @@ PortableServer::POAManager_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::POAManager::POAManager (void) {} - // destructor - PortableServer::POAManager::~POAManager (void) - {} - - PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return POAManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::POAManager_ptr PortableServer::POAManager::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return POAManager::_nil (); - return - ACE_reinterpret_cast - ( - POAManager_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &POAManager::_tao_class_id - ) - ) - ); +PortableServer::POAManager::~POAManager (void) +{} + +PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return POAManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::POAManager_ptr +PortableServer::POAManager::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return POAManager::_nil (); + return + ACE_reinterpret_cast + ( + POAManager_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &POAManager::_tao_class_id + ) + ) + ); } PortableServer::POAManager_ptr @@ -3234,7 +3686,6 @@ PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer:: return *this; } -// Narrow. PortableServer::POAManager::AdapterInactive * PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *exc) { @@ -3248,6 +3699,25 @@ PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POAManager::AdapterInactive, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POAManager::AdapterInactive::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POAManager::AdapterInactive (*this), + 0 + ); + return result; +} + void PortableServer::POAManager::AdapterInactive::_raise () { TAO_RAISE (*this); @@ -3269,20 +3739,56 @@ void PortableServer::POAManager::AdapterInactive::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void) +#if (TAO_HAS_MINIMUM_POA == 0) +int PortableServer::AdapterActivator::_tao_class_id = 0; + +PortableServer::AdapterActivator_ptr +tao_PortableServer_AdapterActivator_duplicate ( + PortableServer::AdapterActivator_ptr p + ) { - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POAManager::AdapterInactive, 0); - return retval; + return PortableServer::AdapterActivator::_duplicate (p); } -#if (TAO_HAS_MINIMUM_POA == 0) +void +tao_PortableServer_AdapterActivator_release ( + PortableServer::AdapterActivator_ptr p + ) +{ + CORBA::release (p); +} -int PortableServer::AdapterActivator::_tao_class_id = 0; +PortableServer::AdapterActivator_ptr +tao_PortableServer_AdapterActivator_nil ( + void + ) +{ + return PortableServer::AdapterActivator::_nil (); +} + +PortableServer::AdapterActivator_ptr +tao_PortableServer_AdapterActivator_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_AdapterActivator_upcast ( + void *src + ) +{ + PortableServer::AdapterActivator **tmp = + ACE_static_cast (PortableServer::AdapterActivator **, src); + return *tmp; +} // ************************************************************* -// Operations for class PortableServer::AdapterActivator_var +// PortableServer::AdapterActivator_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::AdapterActivator_var::AdapterActivator_var (void) // default constructor @@ -3405,7 +3911,9 @@ PortableServer::AdapterActivator_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::AdapterActivator_out +// PortableServer::AdapterActivator_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr &p) @@ -3464,41 +3972,44 @@ PortableServer::AdapterActivator_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::AdapterActivator::AdapterActivator (void) {} - // destructor - PortableServer::AdapterActivator::~AdapterActivator (void) - {} - - PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return AdapterActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return AdapterActivator::_nil (); - return - ACE_reinterpret_cast - ( - AdapterActivator_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &AdapterActivator::_tao_class_id - ) - ) - ); +PortableServer::AdapterActivator::~AdapterActivator (void) +{} + +PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return AdapterActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::AdapterActivator_ptr +PortableServer::AdapterActivator::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return AdapterActivator::_nil (); + return + ACE_reinterpret_cast + ( + AdapterActivator_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &AdapterActivator::_tao_class_id + ) + ) + ); } PortableServer::AdapterActivator_ptr @@ -3532,8 +4043,53 @@ const char* PortableServer::AdapterActivator::_interface_repository_id (void) co int PortableServer::ServantManager::_tao_class_id = 0; +PortableServer::ServantManager_ptr +tao_PortableServer_ServantManager_duplicate ( + PortableServer::ServantManager_ptr p + ) +{ + return PortableServer::ServantManager::_duplicate (p); +} + +void +tao_PortableServer_ServantManager_release ( + PortableServer::ServantManager_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::ServantManager_ptr +tao_PortableServer_ServantManager_nil ( + void + ) +{ + return PortableServer::ServantManager::_nil (); +} + +PortableServer::ServantManager_ptr +tao_PortableServer_ServantManager_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_ServantManager_upcast ( + void *src + ) +{ + PortableServer::ServantManager **tmp = + ACE_static_cast (PortableServer::ServantManager **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::ServantManager_var +// PortableServer::ServantManager_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::ServantManager_var::ServantManager_var (void) // default constructor @@ -3656,7 +4212,9 @@ PortableServer::ServantManager_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::ServantManager_out +// PortableServer::ServantManager_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p) @@ -3715,41 +4273,44 @@ PortableServer::ServantManager_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::ServantManager::ServantManager (void) {} - // destructor - PortableServer::ServantManager::~ServantManager (void) - {} - - PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ServantManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::ServantManager_ptr PortableServer::ServantManager::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ServantManager::_nil (); - return - ACE_reinterpret_cast - ( - ServantManager_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ServantManager::_tao_class_id - ) - ) - ); +PortableServer::ServantManager::~ServantManager (void) +{} + +PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ServantManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::ServantManager_ptr +PortableServer::ServantManager::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ServantManager::_nil (); + return + ACE_reinterpret_cast + ( + ServantManager_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServantManager::_tao_class_id + ) + ) + ); } PortableServer::ServantManager_ptr @@ -3783,8 +4344,53 @@ const char* PortableServer::ServantManager::_interface_repository_id (void) cons int PortableServer::ServantActivator::_tao_class_id = 0; +PortableServer::ServantActivator_ptr +tao_PortableServer_ServantActivator_duplicate ( + PortableServer::ServantActivator_ptr p + ) +{ + return PortableServer::ServantActivator::_duplicate (p); +} + +void +tao_PortableServer_ServantActivator_release ( + PortableServer::ServantActivator_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::ServantActivator_ptr +tao_PortableServer_ServantActivator_nil ( + void + ) +{ + return PortableServer::ServantActivator::_nil (); +} + +PortableServer::ServantActivator_ptr +tao_PortableServer_ServantActivator_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_ServantActivator_upcast ( + void *src + ) +{ + PortableServer::ServantActivator **tmp = + ACE_static_cast (PortableServer::ServantActivator **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::ServantActivator_var +// PortableServer::ServantActivator_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::ServantActivator_var::ServantActivator_var (void) // default constructor @@ -3907,7 +4513,9 @@ PortableServer::ServantActivator_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::ServantActivator_out +// PortableServer::ServantActivator_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr &p) @@ -3966,41 +4574,44 @@ PortableServer::ServantActivator_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::ServantActivator::ServantActivator (void) {} - // destructor - PortableServer::ServantActivator::~ServantActivator (void) - {} - - PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ServantActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ServantActivator::_nil (); - return - ACE_reinterpret_cast - ( - ServantActivator_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ServantActivator::_tao_class_id - ) - ) - ); +PortableServer::ServantActivator::~ServantActivator (void) +{} + +PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ServantActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::ServantActivator_ptr +PortableServer::ServantActivator::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ServantActivator::_nil (); + return + ACE_reinterpret_cast + ( + ServantActivator_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServantActivator::_tao_class_id + ) + ) + ); } PortableServer::ServantActivator_ptr @@ -4046,8 +4657,53 @@ const char* PortableServer::ServantActivator::_interface_repository_id (void) co int PortableServer::ServantLocator::_tao_class_id = 0; +PortableServer::ServantLocator_ptr +tao_PortableServer_ServantLocator_duplicate ( + PortableServer::ServantLocator_ptr p + ) +{ + return PortableServer::ServantLocator::_duplicate (p); +} + +void +tao_PortableServer_ServantLocator_release ( + PortableServer::ServantLocator_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::ServantLocator_ptr +tao_PortableServer_ServantLocator_nil ( + void + ) +{ + return PortableServer::ServantLocator::_nil (); +} + +PortableServer::ServantLocator_ptr +tao_PortableServer_ServantLocator_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_ServantLocator_upcast ( + void *src + ) +{ + PortableServer::ServantLocator **tmp = + ACE_static_cast (PortableServer::ServantLocator **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::ServantLocator_var +// PortableServer::ServantLocator_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::ServantLocator_var::ServantLocator_var (void) // default constructor @@ -4170,7 +4826,9 @@ PortableServer::ServantLocator_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::ServantLocator_out +// PortableServer::ServantLocator_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p) @@ -4229,41 +4887,44 @@ PortableServer::ServantLocator_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::ServantLocator::ServantLocator (void) {} - // destructor - PortableServer::ServantLocator::~ServantLocator (void) - {} - - PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return ServantLocator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return ServantLocator::_nil (); - return - ACE_reinterpret_cast - ( - ServantLocator_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ServantLocator::_tao_class_id - ) - ) - ); +PortableServer::ServantLocator::~ServantLocator (void) +{} + +PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return ServantLocator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::ServantLocator_ptr +PortableServer::ServantLocator::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return ServantLocator::_nil (); + return + ACE_reinterpret_cast + ( + ServantLocator_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServantLocator::_tao_class_id + ) + ) + ); } PortableServer::ServantLocator_ptr @@ -4311,8 +4972,53 @@ const char* PortableServer::ServantLocator::_interface_repository_id (void) cons int PortableServer::POA::_tao_class_id = 0; +PortableServer::POA_ptr +tao_PortableServer_POA_duplicate ( + PortableServer::POA_ptr p + ) +{ + return PortableServer::POA::_duplicate (p); +} + +void +tao_PortableServer_POA_release ( + PortableServer::POA_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::POA_ptr +tao_PortableServer_POA_nil ( + void + ) +{ + return PortableServer::POA::_nil (); +} + +PortableServer::POA_ptr +tao_PortableServer_POA_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_POA_upcast ( + void *src + ) +{ + PortableServer::POA **tmp = + ACE_static_cast (PortableServer::POA **, src); + return *tmp; +} + // ************************************************************* -// Operations for class PortableServer::POA_var +// PortableServer::POA_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::POA_var::POA_var (void) // default constructor @@ -4435,7 +5141,9 @@ PortableServer::POA_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::POA_out +// PortableServer::POA_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::POA_out::POA_out (POA_ptr &p) @@ -4494,41 +5202,44 @@ PortableServer::POA_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::POA::POA (void) {} - // destructor - PortableServer::POA::~POA (void) - {} - - PortableServer::POA_ptr PortableServer::POA::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::POA_ptr PortableServer::POA::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return POA::_nil (); - return - ACE_reinterpret_cast - ( - POA_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &POA::_tao_class_id - ) - ) - ); +PortableServer::POA::~POA (void) +{} + +PortableServer::POA_ptr PortableServer::POA::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::POA_ptr +PortableServer::POA::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return POA::_nil (); + return + ACE_reinterpret_cast + ( + POA_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &POA::_tao_class_id + ) + ) + ); } PortableServer::POA_ptr @@ -4585,7 +5296,6 @@ PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::PO return *this; } -// Narrow. PortableServer::POA::AdapterAlreadyExists * PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *exc) { @@ -4599,6 +5309,25 @@ PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::AdapterAlreadyExists, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::AdapterAlreadyExists::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::AdapterAlreadyExists (*this), + 0 + ); + return result; +} + void PortableServer::POA::AdapterAlreadyExists::_raise () { TAO_RAISE (*this); @@ -4620,14 +5349,6 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::AdapterAlreadyExists, 0); - return retval; -} - // Default constructor. PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void) : CORBA_UserException ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0") @@ -4653,7 +5374,6 @@ PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA: return *this; } -// Narrow. PortableServer::POA::AdapterNonExistent * PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *exc) { @@ -4667,6 +5387,25 @@ PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::AdapterNonExistent, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::AdapterNonExistent::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::AdapterNonExistent (*this), + 0 + ); + return result; +} + void PortableServer::POA::AdapterNonExistent::_raise () { TAO_RAISE (*this); @@ -4688,14 +5427,6 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::AdapterNonExistent, 0); - return retval; -} - // Default constructor. PortableServer::POA::InvalidPolicy::InvalidPolicy (void) : CORBA_UserException ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0") @@ -4723,7 +5454,6 @@ PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::Inva return *this; } -// Narrow. PortableServer::POA::InvalidPolicy * PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *exc) { @@ -4737,6 +5467,25 @@ PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::InvalidPolicy, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::InvalidPolicy::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::InvalidPolicy (*this), + 0 + ); + return result; +} + void PortableServer::POA::InvalidPolicy::_raise () { TAO_RAISE (*this); @@ -4758,14 +5507,6 @@ void PortableServer::POA::InvalidPolicy::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::InvalidPolicy, 0); - return retval; -} - PortableServer::POA::InvalidPolicy::InvalidPolicy ( CORBA::UShort _tao_index ) @@ -4801,7 +5542,6 @@ PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServan return *this; } -// Narrow. PortableServer::POA::NoServant * PortableServer::POA::NoServant::_downcast (CORBA::Exception *exc) { @@ -4815,6 +5555,25 @@ PortableServer::POA::NoServant::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::NoServant::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::NoServant, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::NoServant::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::NoServant (*this), + 0 + ); + return result; +} + void PortableServer::POA::NoServant::_raise () { TAO_RAISE (*this); @@ -4836,14 +5595,6 @@ void PortableServer::POA::NoServant::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::NoServant::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::NoServant, 0); - return retval; -} - #endif /* TAO_HAS_MINIMUM_POA == 0 */ // Default constructor. @@ -4871,7 +5622,6 @@ PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA return *this; } -// Narrow. PortableServer::POA::ObjectAlreadyActive * PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *exc) { @@ -4885,6 +5635,25 @@ PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::ObjectAlreadyActive, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::ObjectAlreadyActive::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::ObjectAlreadyActive (*this), + 0 + ); + return result; +} + void PortableServer::POA::ObjectAlreadyActive::_raise () { TAO_RAISE (*this); @@ -4906,14 +5675,6 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::ObjectAlreadyActive, 0); - return retval; -} - // Default constructor. PortableServer::POA::ObjectNotActive::ObjectNotActive (void) : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0") @@ -4939,7 +5700,6 @@ PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::Ob return *this; } -// Narrow. PortableServer::POA::ObjectNotActive * PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *exc) { @@ -4953,6 +5713,25 @@ PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::ObjectNotActive, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::ObjectNotActive::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::ObjectNotActive (*this), + 0 + ); + return result; +} + void PortableServer::POA::ObjectNotActive::_raise () { TAO_RAISE (*this); @@ -4974,14 +5753,6 @@ void PortableServer::POA::ObjectNotActive::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::ObjectNotActive, 0); - return retval; -} - // Default constructor. PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void) : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0") @@ -5007,7 +5778,6 @@ PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::PO return *this; } -// Narrow. PortableServer::POA::ServantAlreadyActive * PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *exc) { @@ -5021,6 +5791,25 @@ PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::ServantAlreadyActive, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::ServantAlreadyActive::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::ServantAlreadyActive (*this), + 0 + ); + return result; +} + void PortableServer::POA::ServantAlreadyActive::_raise () { TAO_RAISE (*this); @@ -5042,14 +5831,6 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::ServantAlreadyActive, 0); - return retval; -} - // Default constructor. PortableServer::POA::ServantNotActive::ServantNotActive (void) : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0") @@ -5075,7 +5856,6 @@ PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::S return *this; } -// Narrow. PortableServer::POA::ServantNotActive * PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *exc) { @@ -5089,6 +5869,25 @@ PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::ServantNotActive, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::ServantNotActive::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::ServantNotActive (*this), + 0 + ); + return result; +} + void PortableServer::POA::ServantNotActive::_raise () { TAO_RAISE (*this); @@ -5110,14 +5909,6 @@ void PortableServer::POA::ServantNotActive::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::ServantNotActive, 0); - return retval; -} - // Default constructor. PortableServer::POA::WrongAdapter::WrongAdapter (void) : CORBA_UserException ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0") @@ -5143,7 +5934,6 @@ PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::Wrong return *this; } -// Narrow. PortableServer::POA::WrongAdapter * PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *exc) { @@ -5157,6 +5947,25 @@ PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::WrongAdapter, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::WrongAdapter::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::WrongAdapter (*this), + 0 + ); + return result; +} + void PortableServer::POA::WrongAdapter::_raise () { TAO_RAISE (*this); @@ -5178,14 +5987,6 @@ void PortableServer::POA::WrongAdapter::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::WrongAdapter, 0); - return retval; -} - // Default constructor. PortableServer::POA::WrongPolicy::WrongPolicy (void) : CORBA_UserException ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0") @@ -5211,7 +6012,6 @@ PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongP return *this; } -// Narrow. PortableServer::POA::WrongPolicy * PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *exc) { @@ -5225,6 +6025,25 @@ PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::POA::WrongPolicy, 0); + return retval; +} + +CORBA::Exception * +PortableServer::POA::WrongPolicy::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::POA::WrongPolicy (*this), + 0 + ); + return result; +} + void PortableServer::POA::WrongPolicy::_raise () { TAO_RAISE (*this); @@ -5246,18 +6065,55 @@ void PortableServer::POA::WrongPolicy::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void) +int PortableServer::Current::_tao_class_id = 0; + +PortableServer::Current_ptr +tao_PortableServer_Current_duplicate ( + PortableServer::Current_ptr p + ) { - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::WrongPolicy, 0); - return retval; + return PortableServer::Current::_duplicate (p); } -int PortableServer::Current::_tao_class_id = 0; +void +tao_PortableServer_Current_release ( + PortableServer::Current_ptr p + ) +{ + CORBA::release (p); +} + +PortableServer::Current_ptr +tao_PortableServer_Current_nil ( + void + ) +{ + return PortableServer::Current::_nil (); +} + +PortableServer::Current_ptr +tao_PortableServer_Current_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_PortableServer_Current_upcast ( + void *src + ) +{ + PortableServer::Current **tmp = + ACE_static_cast (PortableServer::Current **, src); + return *tmp; +} // ************************************************************* -// Operations for class PortableServer::Current_var +// PortableServer::Current_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* PortableServer::Current_var::Current_var (void) // default constructor @@ -5380,7 +6236,9 @@ PortableServer::Current_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class PortableServer::Current_out +// PortableServer::Current_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* PortableServer::Current_out::Current_out (Current_ptr &p) @@ -5439,41 +6297,44 @@ PortableServer::Current_out::operator-> (void) } -// default constructor +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + PortableServer::Current::Current (void) {} - // destructor - PortableServer::Current::~Current (void) - {} - - PortableServer::Current_ptr PortableServer::Current::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) - { - return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); - } - PortableServer::Current_ptr PortableServer::Current::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) - { - if (CORBA::is_nil (obj)) - return Current::_nil (); - return - ACE_reinterpret_cast - ( - Current_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &Current::_tao_class_id - ) - ) - ); +PortableServer::Current::~Current (void) +{} + +PortableServer::Current_ptr PortableServer::Current::_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL + ) +{ + return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); +} + +PortableServer::Current_ptr +PortableServer::Current::_unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (obj)) + return Current::_nil (); + return + ACE_reinterpret_cast + ( + Current_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &Current::_tao_class_id + ) + ) + ); } PortableServer::Current_ptr @@ -5542,7 +6403,6 @@ PortableServer::Current::NoContext::operator= (const ::PortableServer::Current:: return *this; } -// Narrow. PortableServer::Current::NoContext * PortableServer::Current::NoContext::_downcast (CORBA::Exception *exc) { @@ -5556,6 +6416,25 @@ PortableServer::Current::NoContext::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *PortableServer::Current::NoContext::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::Current::NoContext, 0); + return retval; +} + +CORBA::Exception * +PortableServer::Current::NoContext::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + PortableServer::Current::NoContext (*this), + 0 + ); + return result; +} + void PortableServer::Current::NoContext::_raise () { TAO_RAISE (*this); @@ -5577,38 +6456,6 @@ void PortableServer::Current::NoContext::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *PortableServer::Current::NoContext::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::Current::NoContext, 0); - return retval; -} - -char * -PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id) -{ - return TAO_POA::ObjectId_to_string (id); -} - -CORBA::WChar * -PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id) -{ - return TAO_POA::ObjectId_to_wstring (id); -} - -PortableServer::ObjectId * -PortableServer::string_to_ObjectId (const char *id) -{ - return TAO_POA::string_to_ObjectId (id); -} - -PortableServer::ObjectId * -PortableServer::wstring_to_ObjectId (const CORBA::WChar *id) -{ - return TAO_POA::wstring_to_ObjectId (id); -} - void operator<<= ( CORBA::Any &_tao_any, const PortableServer::ObjectId &_tao_elem @@ -5977,10 +6824,6 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ID return 0; } -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - -#if (TAO_HAS_MINIMUM_POA == 0) - void operator<<= (CORBA::Any &_tao_any, PortableServer::ThreadPolicyValue _tao_elem) { TAO_OutputCDR stream; diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 393d325abe2..d654972f389 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -19,21 +19,21 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_PORTABLESERVERC_H_ -#define _TAO_IDL_PORTABLESERVERC_H_ +#ifndef _TAO_IDL_ORIG_PORTABLESERVERC_H_ +#define _TAO_IDL_ORIG_PORTABLESERVERC_H_ #include "ace/pre.h" -#include "portableserver_export.h" #include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "portableserver_export.h" #include "tao/CurrentC.h" +#include "tao/Sequence.h" +#include "tao/Exception.h" #include "tao/PolicyC.h" -#include "tao/Typecode.h" -#include "tao/Any.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -451,17 +451,17 @@ TAO_NAMESPACE PortableServer CORBA::Object_var forward_reference; ForwardRequest (void); - // Default constructor. - ForwardRequest (const ForwardRequest &); - // Copy constructor. - ~ForwardRequest (void); - // Destructor. + + ForwardRequest &operator= (const ForwardRequest &); static void _tao_any_destructor (void*); - ForwardRequest &operator= (const ForwardRequest &); + static ForwardRequest *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -475,16 +475,12 @@ TAO_NAMESPACE PortableServer ACE_ENV_ARG_DECL_NOT_USED ); - static ForwardRequest *_downcast (CORBA::Exception *); - - ForwardRequest ( + ForwardRequest ( const CORBA::Object_ptr _tao_forward_reference ); - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception PortableServer::ForwardRequest. + }; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; @@ -503,17 +499,17 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; public: NotAGroupObject (void); - // Default constructor. - NotAGroupObject (const NotAGroupObject &); - // Copy constructor. - ~NotAGroupObject (void); - // Destructor. + + NotAGroupObject &operator= (const NotAGroupObject &); static void _tao_any_destructor (void*); - NotAGroupObject &operator= (const NotAGroupObject &); + static NotAGroupObject *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void); @@ -527,13 +523,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; ACE_ENV_ARG_DECL_NOT_USED ); - static NotAGroupObject *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception PortableServer::NotAGroupObject. + }; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; @@ -843,6 +835,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ThreadPolicyValue value ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -990,6 +983,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::LifespanPolicyValue value ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1135,6 +1129,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::IdUniquenessPolicyValue value ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1280,6 +1275,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::IdAssignmentPolicyValue value ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1427,6 +1423,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ImplicitActivationPolicyValue value ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1576,6 +1573,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ServantRetentionPolicyValue value ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1726,6 +1724,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::RequestProcessingPolicyValue value ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1871,16 +1870,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: AdapterInactive (void); - // Default constructor. - AdapterInactive (const AdapterInactive &); - // Copy constructor. - ~AdapterInactive (void); - // Destructor. AdapterInactive &operator= (const AdapterInactive &); + static AdapterInactive *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -1893,12 +1892,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static AdapterInactive *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POAManager::AdapterInactive. + }; #endif /* end #if !defined */ @@ -1913,43 +1908,48 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; typedef State &State_out; virtual void activate ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POAManager::AdapterInactive + CORBA::SystemException + , PortableServer::POAManager::AdapterInactive )) = 0; #if (TAO_HAS_MINIMUM_POA == 0) virtual void hold_requests ( - CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POAManager::AdapterInactive + CORBA::SystemException + , PortableServer::POAManager::AdapterInactive )) = 0; virtual void discard_requests ( - CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POAManager::AdapterInactive + CORBA::SystemException + , PortableServer::POAManager::AdapterInactive )) = 0; virtual void deactivate ( CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POAManager::AdapterInactive + CORBA::SystemException + , PortableServer::POAManager::AdapterInactive )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::POAManager::State get_state ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2088,7 +2088,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, - const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS + const char * name + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2354,12 +2355,13 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual ::PortableServer::Servant incarnate ( const PortableServer::ObjectId & oid, - PortableServer::POA_ptr adapter ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::POA_ptr adapter + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) #if (TAO_HAS_MINIMUM_CORBA == 0) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::ForwardRequest + CORBA::SystemException + , PortableServer::ForwardRequest )) = 0; #else ACE_THROW_SPEC (( @@ -2372,7 +2374,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean remaining_activations + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2514,12 +2517,13 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, const char * operation, - PortableServer::ServantLocator::Cookie & the_cookie ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantLocator::Cookie & the_cookie + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) #if (TAO_HAS_MINIMUM_CORBA == 0) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::ForwardRequest + CORBA::SystemException + , PortableServer::ForwardRequest )) = 0; #else ACE_THROW_SPEC (( @@ -2532,7 +2536,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; PortableServer::POA_ptr adapter, const char * operation, PortableServer::ServantLocator::Cookie the_cookie, - PortableServer::Servant the_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant the_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2681,16 +2686,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: AdapterAlreadyExists (void); - // Default constructor. - AdapterAlreadyExists (const AdapterAlreadyExists &); - // Copy constructor. - ~AdapterAlreadyExists (void); - // Destructor. AdapterAlreadyExists &operator= (const AdapterAlreadyExists &); + static AdapterAlreadyExists *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2703,12 +2708,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static AdapterAlreadyExists *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::AdapterAlreadyExists. + }; #endif /* end #if !defined */ @@ -2722,16 +2723,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: AdapterNonExistent (void); - // Default constructor. - AdapterNonExistent (const AdapterNonExistent &); - // Copy constructor. - ~AdapterNonExistent (void); - // Destructor. AdapterNonExistent &operator= (const AdapterNonExistent &); + static AdapterNonExistent *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2744,12 +2745,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static AdapterNonExistent *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::AdapterNonExistent. + }; #endif /* end #if !defined */ @@ -2764,16 +2761,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; CORBA::UShort index; InvalidPolicy (void); - // Default constructor. - InvalidPolicy (const InvalidPolicy &); - // Copy constructor. - ~InvalidPolicy (void); - // Destructor. InvalidPolicy &operator= (const InvalidPolicy &); + static InvalidPolicy *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2786,15 +2783,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static InvalidPolicy *_downcast (CORBA::Exception *); - - InvalidPolicy ( + InvalidPolicy ( CORBA::UShort _tao_index ); - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::InvalidPolicy. + }; #endif /* end #if !defined */ @@ -2809,16 +2802,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: NoServant (void); - // Default constructor. - NoServant (const NoServant &); - // Copy constructor. - ~NoServant (void); - // Destructor. NoServant &operator= (const NoServant &); + static NoServant *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2831,12 +2824,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static NoServant *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::NoServant. + }; #endif /* end #if !defined */ @@ -2851,16 +2840,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: ObjectAlreadyActive (void); - // Default constructor. - ObjectAlreadyActive (const ObjectAlreadyActive &); - // Copy constructor. - ~ObjectAlreadyActive (void); - // Destructor. ObjectAlreadyActive &operator= (const ObjectAlreadyActive &); + static ObjectAlreadyActive *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2873,12 +2862,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static ObjectAlreadyActive *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::ObjectAlreadyActive. + }; #endif /* end #if !defined */ @@ -2892,16 +2877,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: ObjectNotActive (void); - // Default constructor. - ObjectNotActive (const ObjectNotActive &); - // Copy constructor. - ~ObjectNotActive (void); - // Destructor. ObjectNotActive &operator= (const ObjectNotActive &); + static ObjectNotActive *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2914,17 +2899,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static ObjectNotActive *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::ObjectNotActive. + }; #endif /* end #if !defined */ - #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_ @@ -2933,16 +2913,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: ServantAlreadyActive (void); - // Default constructor. - ServantAlreadyActive (const ServantAlreadyActive &); - // Copy constructor. - ~ServantAlreadyActive (void); - // Destructor. ServantAlreadyActive &operator= (const ServantAlreadyActive &); + static ServantAlreadyActive *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2955,12 +2935,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static ServantAlreadyActive *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::ServantAlreadyActive. + }; #endif /* end #if !defined */ @@ -2974,16 +2950,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: ServantNotActive (void); - // Default constructor. - ServantNotActive (const ServantNotActive &); - // Copy constructor. - ~ServantNotActive (void); - // Destructor. ServantNotActive &operator= (const ServantNotActive &); + static ServantNotActive *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2996,12 +2972,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static ServantNotActive *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::ServantNotActive. + }; #endif /* end #if !defined */ @@ -3015,16 +2987,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: WrongAdapter (void); - // Default constructor. - WrongAdapter (const WrongAdapter &); - // Copy constructor. - ~WrongAdapter (void); - // Destructor. WrongAdapter &operator= (const WrongAdapter &); + static WrongAdapter *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -3037,12 +3009,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static WrongAdapter *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::WrongAdapter. + }; #endif /* end #if !defined */ @@ -3056,16 +3024,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: WrongPolicy (void); - // Default constructor. - WrongPolicy (const WrongPolicy &); - // Copy constructor. - ~WrongPolicy (void); - // Destructor. WrongPolicy &operator= (const WrongPolicy &); + static WrongPolicy *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -3078,12 +3046,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static WrongPolicy *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::POA::WrongPolicy. + }; #endif /* end #if !defined */ @@ -3091,26 +3055,29 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual ::PortableServer::POA_ptr create_POA ( const char * adapter_name, PortableServer::POAManager_ptr a_POAManager, - const CORBA::PolicyList & policies ACE_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::PolicyList & policies + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy + CORBA::SystemException + , PortableServer::POA::AdapterAlreadyExists + , PortableServer::POA::InvalidPolicy )) = 0; virtual ::PortableServer::POA_ptr find_POA ( const char * adapter_name, - CORBA::Boolean activate_it ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean activate_it + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::AdapterNonExistent + CORBA::SystemException + , PortableServer::POA::AdapterNonExistent )) = 0; virtual void destroy ( CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3119,7 +3086,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy ( - PortableServer::ThreadPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ThreadPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3128,21 +3096,24 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy ( - PortableServer::LifespanPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::LifespanPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( - PortableServer::IdUniquenessPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::IdUniquenessPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( - PortableServer::IdAssignmentPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::IdAssignmentPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3151,21 +3122,24 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( - PortableServer::ImplicitActivationPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ImplicitActivationPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( - PortableServer::ServantRetentionPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantRetentionPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( - PortableServer::RequestProcessingPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::RequestProcessingPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3174,6 +3148,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual char * the_name ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -3181,6 +3156,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::POA_ptr the_parent ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -3188,6 +3164,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::POAList * the_children ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -3195,6 +3172,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::POAManager_ptr the_POAManager ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -3202,8 +3180,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; #if (TAO_HAS_MINIMUM_POA == 0) - virtual ::PortableServer::AdapterActivator_ptr the_activator ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -3211,149 +3189,166 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void the_activator ( - PortableServer::AdapterActivator_ptr the_activator ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::AdapterActivator_ptr the_activator + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::ServantManager_ptr get_servant_manager ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::WrongPolicy )) = 0; virtual void set_servant_manager ( - PortableServer::ServantManager_ptr imgr ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantManager_ptr imgr + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::WrongPolicy )) = 0; virtual ::PortableServer::Servant get_servant ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::NoServant + , PortableServer::POA::WrongPolicy )) = 0; virtual void set_servant ( - PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::WrongPolicy )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::ObjectId * activate_object ( - PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::ServantAlreadyActive + , PortableServer::POA::WrongPolicy )) = 0; virtual void activate_object_with_id ( const PortableServer::ObjectId & id, - PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::ServantAlreadyActive + , PortableServer::POA::ObjectAlreadyActive + , PortableServer::POA::WrongPolicy )) = 0; virtual void deactivate_object ( - const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::ObjectNotActive + , PortableServer::POA::WrongPolicy )) = 0; virtual CORBA::Object_ptr create_reference ( - const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS + const char * intf + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::WrongPolicy )) = 0; virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId & oid, - const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS + const char * intf + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::WrongPolicy )) = 0; virtual ::PortableServer::ObjectId * servant_to_id ( - PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::ServantNotActive + , PortableServer::POA::WrongPolicy )) = 0; virtual CORBA::Object_ptr servant_to_reference ( - PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::ServantNotActive + , PortableServer::POA::WrongPolicy )) = 0; virtual ::PortableServer::Servant reference_to_servant ( - CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr reference + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::ObjectNotActive + , PortableServer::POA::WrongAdapter + , PortableServer::POA::WrongPolicy )) = 0; virtual ::PortableServer::ObjectId * reference_to_id ( - CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr reference + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::WrongAdapter + , PortableServer::POA::WrongPolicy )) = 0; virtual ::PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::ObjectNotActive + , PortableServer::POA::WrongPolicy )) = 0; virtual CORBA::Object_ptr id_to_reference ( - const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy + CORBA::SystemException + , PortableServer::POA::ObjectNotActive + , PortableServer::POA::WrongPolicy )) = 0; virtual ::CORBA::OctetSeq * id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -3363,37 +3358,41 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ObjectId * create_id_for_reference ( - CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr the_ref + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject + CORBA::SystemException + , PortableServer::NotAGroupObject )) = 0; virtual ::PortableServer::IDs * reference_to_ids ( - CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr the_ref + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject + CORBA::SystemException + , PortableServer::NotAGroupObject )) = 0; virtual void associate_reference_with_id ( CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject + CORBA::SystemException + , PortableServer::NotAGroupObject )) = 0; virtual void disassociate_reference_with_id ( CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject + CORBA::SystemException + , PortableServer::NotAGroupObject )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -3536,16 +3535,16 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; public: NoContext (void); - // Default constructor. - NoContext (const NoContext &); - // Copy constructor. - ~NoContext (void); - // Destructor. NoContext &operator= (const NoContext &); + static NoContext *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -3558,30 +3557,28 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; ACE_ENV_ARG_DECL_NOT_USED ); - static NoContext *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception PortableServer::Current::NoContext. + }; #endif /* end #if !defined */ virtual ::PortableServer::POA_ptr get_POA ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::Current::NoContext + CORBA::SystemException + , PortableServer::Current::NoContext )) = 0; virtual ::PortableServer::ObjectId * get_object_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::Current::NoContext + CORBA::SystemException + , PortableServer::Current::NoContext )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -3601,11 +3598,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* end #if !defined */ + TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id); TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id); TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id); TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id); - } TAO_NAMESPACE_CLOSE // module PortableServer @@ -3685,6 +3682,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &); + #if !defined _TAO_CDR_OP_PortableServer_IDs_H_ #define _TAO_CDR_OP_PortableServer_IDs_H_ diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i index 4023c0925a5..81b49a194b4 100644 --- a/TAO/tao/PortableServer/PortableServerC.i +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -1035,99 +1035,13 @@ PortableServer::IDs_out::operator[] (CORBA::ULong index) #if !defined (_PORTABLESERVER_THREADPOLICY___CI_) #define _PORTABLESERVER_THREADPOLICY___CI_ -ACE_INLINE PortableServer::ThreadPolicy_ptr -tao_PortableServer_ThreadPolicy_duplicate ( - PortableServer::ThreadPolicy_ptr p - ) -{ - return PortableServer::ThreadPolicy::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_ThreadPolicy_release ( - PortableServer::ThreadPolicy_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::ThreadPolicy_ptr -tao_PortableServer_ThreadPolicy_nil ( - void - ) -{ - return PortableServer::ThreadPolicy::_nil (); -} - -ACE_INLINE PortableServer::ThreadPolicy_ptr -tao_PortableServer_ThreadPolicy_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_ThreadPolicy_upcast ( - void *src - ) -{ - PortableServer::ThreadPolicy **tmp = - ACE_static_cast (PortableServer::ThreadPolicy **, src); - return *tmp; -} - #endif /* end #if !defined */ -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - #if !defined (_PORTABLESERVER_LIFESPANPOLICY___CI_) #define _PORTABLESERVER_LIFESPANPOLICY___CI_ -ACE_INLINE PortableServer::LifespanPolicy_ptr -tao_PortableServer_LifespanPolicy_duplicate ( - PortableServer::LifespanPolicy_ptr p - ) -{ - return PortableServer::LifespanPolicy::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_LifespanPolicy_release ( - PortableServer::LifespanPolicy_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::LifespanPolicy_ptr -tao_PortableServer_LifespanPolicy_nil ( - void - ) -{ - return PortableServer::LifespanPolicy::_nil (); -} - -ACE_INLINE PortableServer::LifespanPolicy_ptr -tao_PortableServer_LifespanPolicy_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_LifespanPolicy_upcast ( - void *src - ) -{ - PortableServer::LifespanPolicy **tmp = - ACE_static_cast (PortableServer::LifespanPolicy **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1135,48 +1049,6 @@ tao_PortableServer_LifespanPolicy_upcast ( #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___CI_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY___CI_ -ACE_INLINE PortableServer::IdUniquenessPolicy_ptr -tao_PortableServer_IdUniquenessPolicy_duplicate ( - PortableServer::IdUniquenessPolicy_ptr p - ) -{ - return PortableServer::IdUniquenessPolicy::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_IdUniquenessPolicy_release ( - PortableServer::IdUniquenessPolicy_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::IdUniquenessPolicy_ptr -tao_PortableServer_IdUniquenessPolicy_nil ( - void - ) -{ - return PortableServer::IdUniquenessPolicy::_nil (); -} - -ACE_INLINE PortableServer::IdUniquenessPolicy_ptr -tao_PortableServer_IdUniquenessPolicy_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_IdUniquenessPolicy_upcast ( - void *src - ) -{ - PortableServer::IdUniquenessPolicy **tmp = - ACE_static_cast (PortableServer::IdUniquenessPolicy **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1184,48 +1056,6 @@ tao_PortableServer_IdUniquenessPolicy_upcast ( #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___CI_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY___CI_ -ACE_INLINE PortableServer::IdAssignmentPolicy_ptr -tao_PortableServer_IdAssignmentPolicy_duplicate ( - PortableServer::IdAssignmentPolicy_ptr p - ) -{ - return PortableServer::IdAssignmentPolicy::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_IdAssignmentPolicy_release ( - PortableServer::IdAssignmentPolicy_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::IdAssignmentPolicy_ptr -tao_PortableServer_IdAssignmentPolicy_nil ( - void - ) -{ - return PortableServer::IdAssignmentPolicy::_nil (); -} - -ACE_INLINE PortableServer::IdAssignmentPolicy_ptr -tao_PortableServer_IdAssignmentPolicy_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_IdAssignmentPolicy_upcast ( - void *src - ) -{ - PortableServer::IdAssignmentPolicy **tmp = - ACE_static_cast (PortableServer::IdAssignmentPolicy **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1235,48 +1065,6 @@ tao_PortableServer_IdAssignmentPolicy_upcast ( #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_ -ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr -tao_PortableServer_ImplicitActivationPolicy_duplicate ( - PortableServer::ImplicitActivationPolicy_ptr p - ) -{ - return PortableServer::ImplicitActivationPolicy::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_ImplicitActivationPolicy_release ( - PortableServer::ImplicitActivationPolicy_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr -tao_PortableServer_ImplicitActivationPolicy_nil ( - void - ) -{ - return PortableServer::ImplicitActivationPolicy::_nil (); -} - -ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr -tao_PortableServer_ImplicitActivationPolicy_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_ImplicitActivationPolicy_upcast ( - void *src - ) -{ - PortableServer::ImplicitActivationPolicy **tmp = - ACE_static_cast (PortableServer::ImplicitActivationPolicy **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1284,48 +1072,6 @@ tao_PortableServer_ImplicitActivationPolicy_upcast ( #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_ -ACE_INLINE PortableServer::ServantRetentionPolicy_ptr -tao_PortableServer_ServantRetentionPolicy_duplicate ( - PortableServer::ServantRetentionPolicy_ptr p - ) -{ - return PortableServer::ServantRetentionPolicy::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_ServantRetentionPolicy_release ( - PortableServer::ServantRetentionPolicy_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::ServantRetentionPolicy_ptr -tao_PortableServer_ServantRetentionPolicy_nil ( - void - ) -{ - return PortableServer::ServantRetentionPolicy::_nil (); -} - -ACE_INLINE PortableServer::ServantRetentionPolicy_ptr -tao_PortableServer_ServantRetentionPolicy_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_ServantRetentionPolicy_upcast ( - void *src - ) -{ - PortableServer::ServantRetentionPolicy **tmp = - ACE_static_cast (PortableServer::ServantRetentionPolicy **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1333,48 +1079,6 @@ tao_PortableServer_ServantRetentionPolicy_upcast ( #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_ -ACE_INLINE PortableServer::RequestProcessingPolicy_ptr -tao_PortableServer_RequestProcessingPolicy_duplicate ( - PortableServer::RequestProcessingPolicy_ptr p - ) -{ - return PortableServer::RequestProcessingPolicy::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_RequestProcessingPolicy_release ( - PortableServer::RequestProcessingPolicy_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::RequestProcessingPolicy_ptr -tao_PortableServer_RequestProcessingPolicy_nil ( - void - ) -{ - return PortableServer::RequestProcessingPolicy::_nil (); -} - -ACE_INLINE PortableServer::RequestProcessingPolicy_ptr -tao_PortableServer_RequestProcessingPolicy_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_RequestProcessingPolicy_upcast ( - void *src - ) -{ - PortableServer::RequestProcessingPolicy **tmp = - ACE_static_cast (PortableServer::RequestProcessingPolicy **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1388,99 +1092,13 @@ tao_PortableServer_RequestProcessingPolicy_upcast ( #if !defined (_PORTABLESERVER_POAMANAGER___CI_) #define _PORTABLESERVER_POAMANAGER___CI_ -ACE_INLINE PortableServer::POAManager_ptr -tao_PortableServer_POAManager_duplicate ( - PortableServer::POAManager_ptr p - ) -{ - return PortableServer::POAManager::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_POAManager_release ( - PortableServer::POAManager_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::POAManager_ptr -tao_PortableServer_POAManager_nil ( - void - ) -{ - return PortableServer::POAManager::_nil (); -} - -ACE_INLINE PortableServer::POAManager_ptr -tao_PortableServer_POAManager_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_POAManager_upcast ( - void *src - ) -{ - PortableServer::POAManager **tmp = - ACE_static_cast (PortableServer::POAManager **, src); - return *tmp; -} - #endif /* end #if !defined */ -#if (TAO_HAS_MINIMUM_POA == 0) - #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___CI_) #define _PORTABLESERVER_ADAPTERACTIVATOR___CI_ -ACE_INLINE PortableServer::AdapterActivator_ptr -tao_PortableServer_AdapterActivator_duplicate ( - PortableServer::AdapterActivator_ptr p - ) -{ - return PortableServer::AdapterActivator::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_AdapterActivator_release ( - PortableServer::AdapterActivator_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::AdapterActivator_ptr -tao_PortableServer_AdapterActivator_nil ( - void - ) -{ - return PortableServer::AdapterActivator::_nil (); -} - -ACE_INLINE PortableServer::AdapterActivator_ptr -tao_PortableServer_AdapterActivator_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_AdapterActivator_upcast ( - void *src - ) -{ - PortableServer::AdapterActivator **tmp = - ACE_static_cast (PortableServer::AdapterActivator **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1488,48 +1106,6 @@ tao_PortableServer_AdapterActivator_upcast ( #if !defined (_PORTABLESERVER_SERVANTMANAGER___CI_) #define _PORTABLESERVER_SERVANTMANAGER___CI_ -ACE_INLINE PortableServer::ServantManager_ptr -tao_PortableServer_ServantManager_duplicate ( - PortableServer::ServantManager_ptr p - ) -{ - return PortableServer::ServantManager::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_ServantManager_release ( - PortableServer::ServantManager_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::ServantManager_ptr -tao_PortableServer_ServantManager_nil ( - void - ) -{ - return PortableServer::ServantManager::_nil (); -} - -ACE_INLINE PortableServer::ServantManager_ptr -tao_PortableServer_ServantManager_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_ServantManager_upcast ( - void *src - ) -{ - PortableServer::ServantManager **tmp = - ACE_static_cast (PortableServer::ServantManager **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1537,48 +1113,6 @@ tao_PortableServer_ServantManager_upcast ( #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___CI_) #define _PORTABLESERVER_SERVANTACTIVATOR___CI_ -ACE_INLINE PortableServer::ServantActivator_ptr -tao_PortableServer_ServantActivator_duplicate ( - PortableServer::ServantActivator_ptr p - ) -{ - return PortableServer::ServantActivator::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_ServantActivator_release ( - PortableServer::ServantActivator_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::ServantActivator_ptr -tao_PortableServer_ServantActivator_nil ( - void - ) -{ - return PortableServer::ServantActivator::_nil (); -} - -ACE_INLINE PortableServer::ServantActivator_ptr -tao_PortableServer_ServantActivator_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_ServantActivator_upcast ( - void *src - ) -{ - PortableServer::ServantActivator **tmp = - ACE_static_cast (PortableServer::ServantActivator **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1586,48 +1120,6 @@ tao_PortableServer_ServantActivator_upcast ( #if !defined (_PORTABLESERVER_SERVANTLOCATOR___CI_) #define _PORTABLESERVER_SERVANTLOCATOR___CI_ -ACE_INLINE PortableServer::ServantLocator_ptr -tao_PortableServer_ServantLocator_duplicate ( - PortableServer::ServantLocator_ptr p - ) -{ - return PortableServer::ServantLocator::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_ServantLocator_release ( - PortableServer::ServantLocator_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::ServantLocator_ptr -tao_PortableServer_ServantLocator_nil ( - void - ) -{ - return PortableServer::ServantLocator::_nil (); -} - -ACE_INLINE PortableServer::ServantLocator_ptr -tao_PortableServer_ServantLocator_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_ServantLocator_upcast ( - void *src - ) -{ - PortableServer::ServantLocator **tmp = - ACE_static_cast (PortableServer::ServantLocator **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1677,48 +1169,6 @@ tao_PortableServer_ServantLocator_upcast ( #if !defined (_PORTABLESERVER_POA___CI_) #define _PORTABLESERVER_POA___CI_ -ACE_INLINE PortableServer::POA_ptr -tao_PortableServer_POA_duplicate ( - PortableServer::POA_ptr p - ) -{ - return PortableServer::POA::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_POA_release ( - PortableServer::POA_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::POA_ptr -tao_PortableServer_POA_nil ( - void - ) -{ - return PortableServer::POA::_nil (); -} - -ACE_INLINE PortableServer::POA_ptr -tao_PortableServer_POA_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_POA_upcast ( - void *src - ) -{ - PortableServer::POA **tmp = - ACE_static_cast (PortableServer::POA **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1730,48 +1180,6 @@ tao_PortableServer_POA_upcast ( #if !defined (_PORTABLESERVER_CURRENT___CI_) #define _PORTABLESERVER_CURRENT___CI_ -ACE_INLINE PortableServer::Current_ptr -tao_PortableServer_Current_duplicate ( - PortableServer::Current_ptr p - ) -{ - return PortableServer::Current::_duplicate (p); -} - -ACE_INLINE void -tao_PortableServer_Current_release ( - PortableServer::Current_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE PortableServer::Current_ptr -tao_PortableServer_Current_nil ( - void - ) -{ - return PortableServer::Current::_nil (); -} - -ACE_INLINE PortableServer::Current_ptr -tao_PortableServer_Current_narrow ( - CORBA::Object *p ACE_ENV_ARG_DECL - ) -{ - return PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_PortableServer_Current_upcast ( - void *src - ) -{ - PortableServer::Current **tmp = - ACE_static_cast (PortableServer::Current **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -1993,5 +1401,4 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Reques return _tao_result; } - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/Default_ORT.diff b/TAO/tao/PortableServer/diffs/Default_ORT.diff new file mode 100644 index 00000000000..a15419bd6fd --- /dev/null +++ b/TAO/tao/PortableServer/diffs/Default_ORT.diff @@ -0,0 +1,19 @@ +--- orig/Default_ORTC.h Thu Feb 7 15:05:40 2002 ++++ Default_ORTC.h Thu Feb 7 15:06:51 2002 +@@ -23,14 +23,14 @@ + #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + + #include "portableserver_export.h" +-#include "ObjectReferenceTemplateC.h" ++#include "tao/ObjectReferenceTemplateC.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/PortableServer/diffs/ImplRepo.diff b/TAO/tao/PortableServer/diffs/ImplRepo.diff index 057e16cf4a0..c1de7b512c1 100644 --- a/TAO/tao/PortableServer/diffs/ImplRepo.diff +++ b/TAO/tao/PortableServer/diffs/ImplRepo.diff @@ -1,6 +1,6 @@ ---- orig/ImplRepoC.h Wed Aug 1 17:59:21 2001 -+++ ImplRepoC.h Wed Aug 1 18:03:55 2001 -@@ -23,12 +23,19 @@ +--- orig/ImplRepoC.h Wed Feb 6 10:26:31 2002 ++++ ImplRepoC.h Wed Feb 6 10:31:23 2002 +@@ -23,7 +23,7 @@ #define _TAO_IDL_ORIG_IMPLREPOC_H_ #include "ace/pre.h" @@ -9,409 +9,15 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ +@@ -31,6 +31,11 @@ -+#include "tao/CDR.h" -+#include "tao/Any.h" -+#include "tao/Object.h" -+#include "tao/ClientRequestInfo.h" -+#include "tao/Remote_Object_Proxy_Impl.h" -+#include "tao/Managed_Types.h" -+#include "tao/Sequence.h" #include "portableserver_export.h" - #if defined (TAO_EXPORT_MACRO) ---- orig/ImplRepoC.i Wed Aug 1 17:59:21 2001 -+++ ImplRepoC.i Wed Aug 1 18:03:55 2001 -@@ -23,6 +23,49 @@ - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_) - #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_ - -+ACE_INLINE ImplementationRepository::ServerObject_ptr -+tao_ImplementationRepository_ServerObject_duplicate ( -+ ImplementationRepository::ServerObject_ptr p -+ ) -+{ -+ return ImplementationRepository::ServerObject::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_ImplementationRepository_ServerObject_release ( -+ ImplementationRepository::ServerObject_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE ImplementationRepository::ServerObject_ptr -+tao_ImplementationRepository_ServerObject_nil ( -+ void -+ ) -+{ -+ return ImplementationRepository::ServerObject::_nil (); -+} -+ -+ACE_INLINE ImplementationRepository::ServerObject_ptr -+tao_ImplementationRepository_ServerObject_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_ImplementationRepository_ServerObject_upcast ( -+ void *src -+ ) -+{ -+ ImplementationRepository::ServerObject **tmp = -+ ACE_static_cast (ImplementationRepository::ServerObject **, src); -+ return *tmp; -+} -+ - ACE_INLINE - ImplementationRepository::ServerObject::ServerObject ( - TAO_Stub *objref, -@@ -1420,6 +1463,49 @@ - #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_) - #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_ - -+ACE_INLINE ImplementationRepository::Administration_ptr -+tao_ImplementationRepository_Administration_duplicate ( -+ ImplementationRepository::Administration_ptr p -+ ) -+{ -+ return ImplementationRepository::Administration::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_ImplementationRepository_Administration_release ( -+ ImplementationRepository::Administration_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE ImplementationRepository::Administration_ptr -+tao_ImplementationRepository_Administration_nil ( -+ void -+ ) -+{ -+ return ImplementationRepository::Administration::_nil (); -+} -+ -+ACE_INLINE ImplementationRepository::Administration_ptr -+tao_ImplementationRepository_Administration_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_ImplementationRepository_Administration_upcast ( -+ void *src -+ ) -+{ -+ ImplementationRepository::Administration **tmp = -+ ACE_static_cast (ImplementationRepository::Administration **, src); -+ return *tmp; -+} -+ - ACE_INLINE - ImplementationRepository::Administration::Administration ( - TAO_Stub *objref, -@@ -1438,6 +1524,49 @@ - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_) - #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_ - -+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -+tao_ImplementationRepository_ServerInformationIterator_duplicate ( -+ ImplementationRepository::ServerInformationIterator_ptr p -+ ) -+{ -+ return ImplementationRepository::ServerInformationIterator::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_ImplementationRepository_ServerInformationIterator_release ( -+ ImplementationRepository::ServerInformationIterator_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -+tao_ImplementationRepository_ServerInformationIterator_nil ( -+ void -+ ) -+{ -+ return ImplementationRepository::ServerInformationIterator::_nil (); -+} -+ -+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -+tao_ImplementationRepository_ServerInformationIterator_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_ImplementationRepository_ServerInformationIterator_upcast ( -+ void *src -+ ) -+{ -+ ImplementationRepository::ServerInformationIterator **tmp = -+ ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src); -+ return *tmp; -+} ++#include "tao/Exception.h" ++#include "tao/Object.h" ++#include "tao/Sequence.h" ++#include "tao/Remote_Object_Proxy_Impl.h" + - ACE_INLINE - ImplementationRepository::ServerInformationIterator::ServerInformationIterator ( - TAO_Stub *objref, -@@ -1452,12 +1581,12 @@ - - #endif /* end #if !defined */ - --TAO_PortableServer_Export CORBA::Boolean operator<< ( -+CORBA::Boolean TAO_PortableServer_Export operator<< ( - TAO_OutputCDR &, - const ImplementationRepository::ServerObject_ptr - ); - --TAO_PortableServer_Export CORBA::Boolean operator>> ( -+CORBA::Boolean TAO_PortableServer_Export operator>> ( - TAO_InputCDR &, - ImplementationRepository::ServerObject_ptr & - ); -@@ -1591,22 +1720,22 @@ - - #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */ - --TAO_PortableServer_Export CORBA::Boolean operator<< ( -+CORBA::Boolean TAO_PortableServer_Export operator<< ( - TAO_OutputCDR &, - const ImplementationRepository::ServerInformationIterator_ptr - ); - --TAO_PortableServer_Export CORBA::Boolean operator>> ( -+CORBA::Boolean TAO_PortableServer_Export operator>> ( - TAO_InputCDR &, - ImplementationRepository::ServerInformationIterator_ptr & - ); - --TAO_PortableServer_Export CORBA::Boolean operator<< ( -+CORBA::Boolean TAO_PortableServer_Export operator<< ( - TAO_OutputCDR &, - const ImplementationRepository::Administration_ptr - ); - --TAO_PortableServer_Export CORBA::Boolean operator>> ( -+CORBA::Boolean TAO_PortableServer_Export operator>> ( - TAO_InputCDR &, - ImplementationRepository::Administration_ptr & - ); ---- orig/ImplRepoC.cpp Wed Aug 1 17:59:21 2001 -+++ ImplRepoC.cpp Wed Aug 1 18:03:55 2001 -@@ -41,49 +41,6 @@ - - int ImplementationRepository::ServerObject::_tao_class_id = 0; - --ImplementationRepository::ServerObject_ptr --tao_ImplementationRepository_ServerObject_duplicate ( -- ImplementationRepository::ServerObject_ptr p -- ) --{ -- return ImplementationRepository::ServerObject::_duplicate (p); --} -- --void --tao_ImplementationRepository_ServerObject_release ( -- ImplementationRepository::ServerObject_ptr p -- ) --{ -- CORBA::release (p); --} -- --ImplementationRepository::ServerObject_ptr --tao_ImplementationRepository_ServerObject_nil ( -- void -- ) --{ -- return ImplementationRepository::ServerObject::_nil (); --} -- --ImplementationRepository::ServerObject_ptr --tao_ImplementationRepository_ServerObject_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_ImplementationRepository_ServerObject_upcast ( -- void *src -- ) --{ -- ImplementationRepository::ServerObject **tmp = -- ACE_static_cast (ImplementationRepository::ServerObject **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class ImplementationRepository::ServerObject_var - // ************************************************************* -@@ -206,7 +163,6 @@ - ACE_static_cast (ServerObject **, src); - return *tmp; - } -- - // ************************************************************* - // Operations for class ImplementationRepository::ServerObject_out - // ************************************************************* -@@ -2087,49 +2043,6 @@ - - int ImplementationRepository::Administration::_tao_class_id = 0; - --ImplementationRepository::Administration_ptr --tao_ImplementationRepository_Administration_duplicate ( -- ImplementationRepository::Administration_ptr p -- ) --{ -- return ImplementationRepository::Administration::_duplicate (p); --} -- --void --tao_ImplementationRepository_Administration_release ( -- ImplementationRepository::Administration_ptr p -- ) --{ -- CORBA::release (p); --} -- --ImplementationRepository::Administration_ptr --tao_ImplementationRepository_Administration_nil ( -- void -- ) --{ -- return ImplementationRepository::Administration::_nil (); --} -- --ImplementationRepository::Administration_ptr --tao_ImplementationRepository_Administration_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_ImplementationRepository_Administration_upcast ( -- void *src -- ) --{ -- ImplementationRepository::Administration **tmp = -- ACE_static_cast (ImplementationRepository::Administration **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class ImplementationRepository::Administration_var - // ************************************************************* -@@ -2252,7 +2165,6 @@ - ACE_static_cast (Administration **, src); - return *tmp; - } -- - // ************************************************************* - // Operations for class ImplementationRepository::Administration_out - // ************************************************************* -@@ -5749,49 +5661,6 @@ - - int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0; - --ImplementationRepository::ServerInformationIterator_ptr --tao_ImplementationRepository_ServerInformationIterator_duplicate ( -- ImplementationRepository::ServerInformationIterator_ptr p -- ) --{ -- return ImplementationRepository::ServerInformationIterator::_duplicate (p); --} -- --void --tao_ImplementationRepository_ServerInformationIterator_release ( -- ImplementationRepository::ServerInformationIterator_ptr p -- ) --{ -- CORBA::release (p); --} -- --ImplementationRepository::ServerInformationIterator_ptr --tao_ImplementationRepository_ServerInformationIterator_nil ( -- void -- ) --{ -- return ImplementationRepository::ServerInformationIterator::_nil (); --} -- --ImplementationRepository::ServerInformationIterator_ptr --tao_ImplementationRepository_ServerInformationIterator_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_ImplementationRepository_ServerInformationIterator_upcast ( -- void *src -- ) --{ -- ImplementationRepository::ServerInformationIterator **tmp = -- ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class ImplementationRepository::ServerInformationIterator_var - // ************************************************************* -@@ -5914,7 +5783,6 @@ - ACE_static_cast (ServerInformationIterator **, src); - return *tmp; - } -- - // ************************************************************* - // Operations for class ImplementationRepository::ServerInformationIterator_out - // ************************************************************* -@@ -7784,11 +7652,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -7831,11 +7694,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO + #endif diff --git a/TAO/tao/diffs/PortableServerC.h.diff b/TAO/tao/PortableServer/diffs/PortableServer.diff index 1d37a3d4797..56aea45a11d 100644 --- a/TAO/tao/diffs/PortableServerC.h.diff +++ b/TAO/tao/PortableServer/diffs/PortableServer.diff @@ -1,34 +1,26 @@ ---- PortableServerC.h Mon Jan 14 19:52:29 2002 -+++ PortableServerC.h.mod Mon Jan 14 18:55:19 2002 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,13 +23,17 @@ - #define _TAO_IDL_PORTABLESERVERC_H_ +--- orig/PortableServerC.h Tue Feb 5 16:29:50 2002 ++++ PortableServerC.h Wed Feb 6 19:07:49 2002 +@@ -23,14 +23,17 @@ + #define _TAO_IDL_ORIG_PORTABLESERVERC_H_ #include "ace/pre.h" -#include "tao/corba.h" -+#include "portableserver_export.h" +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ --#include "tao/corbafwd.h" + #include "portableserver_export.h" +-#include "CurrentC.h" +#include "tao/CurrentC.h" ++#include "tao/Sequence.h" ++#include "tao/Exception.h" +#include "tao/PolicyC.h" -+#include "tao/Typecode.h" -+#include "tao/Any.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO -@@ -54,8 +58,23 @@ +@@ -55,8 +58,23 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ @@ -52,7 +44,7 @@ class POA; #if !defined (_PORTABLESERVER_POA___PTR_CH_) -@@ -421,6 +440,7 @@ +@@ -422,6 +440,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId; @@ -60,7 +52,7 @@ #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_) #define _PORTABLESERVER_FORWARDREQUEST_CH_ -@@ -471,6 +491,9 @@ +@@ -468,6 +487,9 @@ #endif /* end #if !defined */ @@ -70,7 +62,7 @@ #if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_) #define _PORTABLESERVER_NOTAGROUPOBJECT_CH_ -@@ -680,6 +703,8 @@ +@@ -673,6 +695,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDs; @@ -79,7 +71,7 @@ TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID; -@@ -700,6 +725,8 @@ +@@ -693,6 +717,8 @@ SINGLE_THREAD_MODEL }; @@ -88,7 +80,7 @@ typedef ThreadPolicyValue &ThreadPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue; -@@ -839,6 +866,8 @@ +@@ -833,6 +859,8 @@ #endif /* end #if !defined */ @@ -97,7 +89,7 @@ enum LifespanPolicyValue { TRANSIENT, -@@ -1280,6 +1309,8 @@ +@@ -1277,6 +1305,8 @@ NO_IMPLICIT_ACTIVATION }; @@ -106,7 +98,7 @@ typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; -@@ -1419,12 +1450,16 @@ +@@ -1417,12 +1447,16 @@ #endif /* end #if !defined */ @@ -123,7 +115,7 @@ typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; -@@ -1564,6 +1599,8 @@ +@@ -1563,6 +1597,8 @@ #endif /* end #if !defined */ @@ -132,7 +124,7 @@ enum RequestProcessingPolicyValue { USE_ACTIVE_OBJECT_MAP_ONLY, -@@ -1571,6 +1608,8 @@ +@@ -1570,6 +1606,8 @@ USE_SERVANT_MANAGER }; @@ -141,7 +133,7 @@ typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; -@@ -1710,6 +1749,7 @@ +@@ -1710,6 +1748,7 @@ #endif /* end #if !defined */ @@ -149,25 +141,25 @@ #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_) #define _PORTABLESERVER_POAMANAGER___PTR_CH_ -@@ -1880,6 +1920,8 @@ - PortableServer::POAManager::AdapterInactive +@@ -1877,6 +1916,8 @@ + , PortableServer::POAManager::AdapterInactive )) = 0; +#if (TAO_HAS_MINIMUM_POA == 0) + virtual void hold_requests ( - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) -@@ -1905,6 +1947,8 @@ - PortableServer::POAManager::AdapterInactive + CORBA::Boolean wait_for_completion + ACE_ENV_ARG_DECL_WITH_DEFAULTS +@@ -1905,6 +1946,8 @@ + , PortableServer::POAManager::AdapterInactive )) = 0; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + virtual ::PortableServer::POAManager::State get_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) -@@ -1929,6 +1973,7 @@ + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS +@@ -1930,6 +1973,7 @@ #endif /* end #if !defined */ @@ -175,14 +167,14 @@ #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_ -@@ -2311,10 +2356,16 @@ - const PortableServer::ObjectId & oid, - PortableServer::POA_ptr adapter TAO_ENV_ARG_DECL_WITH_DEFAULTS +@@ -2314,10 +2358,16 @@ + PortableServer::POA_ptr adapter + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::ForwardRequest + CORBA::SystemException + , PortableServer::ForwardRequest )) = 0; +#else + ACE_THROW_SPEC (( @@ -192,7 +184,7 @@ virtual void etherealize ( const PortableServer::ObjectId & oid, -@@ -2431,6 +2482,9 @@ +@@ -2435,6 +2485,9 @@ : public virtual PortableServer::ServantManager { public: @@ -202,14 +194,14 @@ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef ServantLocator_ptr _ptr_type; typedef ServantLocator_var _var_type; -@@ -2462,10 +2516,16 @@ - const char * operation, - PortableServer::ServantLocator::Cookie & the_cookie TAO_ENV_ARG_DECL_WITH_DEFAULTS +@@ -2467,10 +2520,16 @@ + PortableServer::ServantLocator::Cookie & the_cookie + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::ForwardRequest + CORBA::SystemException + , PortableServer::ForwardRequest )) = 0; +#else + ACE_THROW_SPEC (( @@ -219,7 +211,7 @@ virtual void postinvoke ( const PortableServer::ObjectId & oid, -@@ -2574,6 +2634,7 @@ +@@ -2580,6 +2639,7 @@ #endif /* end #if !defined */ @@ -227,7 +219,7 @@ #if !defined (_PORTABLESERVER_POA_CH_) #define _PORTABLESERVER_POA_CH_ -@@ -2607,6 +2668,10 @@ +@@ -2613,6 +2673,10 @@ return (POA_ptr)0; } @@ -238,7 +230,7 @@ #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_) #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_ -@@ -2734,6 +2799,7 @@ +@@ -2728,6 +2792,7 @@ #endif /* end #if !defined */ @@ -246,7 +238,7 @@ #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_) #define _PORTABLESERVER_POA_NOSERVANT_CH_ -@@ -2775,6 +2841,7 @@ +@@ -2765,6 +2830,7 @@ #endif /* end #if !defined */ @@ -254,71 +246,78 @@ #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_ -@@ -3049,6 +3116,8 @@ +@@ -2839,7 +2905,6 @@ + + #endif /* end #if !defined */ + +- + #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_) + #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_ + +@@ -3018,6 +3083,8 @@ CORBA::SystemException )) = 0; +#if (TAO_HAS_MINIMUM_POA == 0) + virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy ( - PortableServer::ThreadPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) -@@ -3056,6 +3125,8 @@ + PortableServer::ThreadPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS +@@ -3026,6 +3093,8 @@ CORBA::SystemException )) = 0; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy ( - PortableServer::LifespanPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) -@@ -3077,6 +3148,8 @@ + PortableServer::LifespanPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS +@@ -3050,6 +3119,8 @@ CORBA::SystemException )) = 0; +#if (TAO_HAS_MINIMUM_POA == 0) + virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( - PortableServer::ImplicitActivationPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) -@@ -3098,6 +3171,8 @@ + PortableServer::ImplicitActivationPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS +@@ -3074,6 +3145,8 @@ CORBA::SystemException )) = 0; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + virtual char * the_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) -@@ -3126,6 +3201,8 @@ + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS +@@ -3106,6 +3179,7 @@ CORBA::SystemException )) = 0; +#if (TAO_HAS_MINIMUM_POA == 0) -+ virtual ::PortableServer::AdapterActivator_ptr the_activator ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) -@@ -3173,6 +3250,8 @@ - PortableServer::POA::WrongPolicy + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS +@@ -3159,6 +3233,8 @@ + , PortableServer::POA::WrongPolicy )) = 0; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + virtual ::PortableServer::ObjectId * activate_object ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) -@@ -3281,6 +3360,8 @@ + PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS +@@ -3279,6 +3355,8 @@ CORBA::SystemException )) = 0; +#if (TAO_HAS_MINIMUM_POA == 0) + virtual ::PortableServer::ObjectId * create_id_for_reference ( - CORBA::Object_ptr the_ref TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) -@@ -3315,6 +3396,8 @@ - PortableServer::NotAGroupObject + CORBA::Object_ptr the_ref + ACE_ENV_ARG_DECL_WITH_DEFAULTS +@@ -3317,6 +3395,8 @@ + , PortableServer::NotAGroupObject )) = 0; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -326,18 +325,18 @@ virtual void *_tao_QueryInterface (ptr_arith_t type); virtual const char* _interface_repository_id (void) const; -@@ -3518,6 +3601,10 @@ - +@@ -3519,6 +3599,10 @@ #endif /* end #if !defined */ + + TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id); + TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id); + TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id); + TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id); - } TAO_NAMESPACE_CLOSE // module PortableServer -@@ -3526,10 +3613,18 @@ + +@@ -3526,10 +3610,18 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&); @@ -356,7 +355,7 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated -@@ -3540,12 +3635,18 @@ +@@ -3540,12 +3632,18 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::IDs *&); TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &); @@ -375,7 +374,7 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); -@@ -3553,6 +3654,8 @@ +@@ -3553,6 +3651,8 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); @@ -384,7 +383,7 @@ #ifndef __ACE_INLINE__ -@@ -3570,13 +3673,18 @@ +@@ -3570,9 +3670,15 @@ #endif /* _TAO_CDR_OP_PortableServer_ObjectId_H_ */ @@ -400,11 +399,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &); -- - #if !defined _TAO_CDR_OP_PortableServer_IDs_H_ - #define _TAO_CDR_OP_PortableServer_IDs_H_ - -@@ -3593,18 +3701,26 @@ +@@ -3593,18 +3699,26 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); @@ -431,3 +426,328 @@ #endif /* __ACE_INLINE__ */ +--- orig/PortableServerC.i Tue Feb 5 16:29:50 2002 ++++ PortableServerC.i Tue Feb 5 17:04:22 2002 +@@ -627,6 +627,8 @@ + // Inline operations for exception PortableServer::ForwardRequest + // ************************************************************* + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + // ************************************************************* + // Inline operations for exception PortableServer::NotAGroupObject + // ************************************************************* +@@ -1025,6 +1027,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ ++ ++#if (TAO_HAS_MINIMUM_POA == 0) + + #if !defined (_PORTABLESERVER_THREADPOLICY___CI_) + #define _PORTABLESERVER_THREADPOLICY___CI_ +@@ -1054,6 +1060,8 @@ + #endif /* end #if !defined */ + + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_) + #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_ + +@@ -1074,6 +1082,8 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + // ************************************************************* + // Inline operations for exception PortableServer::POAManager::AdapterInactive + // ************************************************************* +@@ -1113,6 +1123,8 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + // ************************************************************* + // Inline operations for exception PortableServer::POA::AdapterAlreadyExists + // ************************************************************* +@@ -1186,6 +1198,8 @@ + + #endif /* _TAO_CDR_OP_PortableServer_ObjectId_I_ */ + ++#if (TAO_HAS_MINIMUM_CORBA == 0) ++ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate) + { + // first marshal the repository ID +@@ -1214,6 +1228,10 @@ + return 0; + } + ++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ++ ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate) + { + // first marshal the repository ID +@@ -1243,6 +1261,10 @@ + + #endif /* _TAO_CDR_OP_PortableServer_IDs_I_ */ + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval) + { + CORBA::ULong _tao_temp = _tao_enumval; +@@ -1262,6 +1284,8 @@ + return _tao_result; + } + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval) + { + CORBA::ULong _tao_temp = _tao_enumval; +@@ -1319,6 +1343,8 @@ + return _tao_result; + } + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval) + { + CORBA::ULong _tao_temp = _tao_enumval; +@@ -1375,4 +1401,4 @@ + + return _tao_result; + } +- ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ +--- orig/PortableServerC.cpp Tue Feb 5 16:29:50 2002 ++++ PortableServerC.cpp Tue Feb 5 17:15:19 2002 +@@ -31,6 +31,8 @@ + #include "tao/ClientInterceptorAdapter.h" + #endif /* TAO_HAS_INTERCEPTORS == 1 */ + ++#include "POA.h" ++ + #if defined (__BORLANDC__) + #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig + #endif /* __BORLANDC__ */ +@@ -39,6 +41,29 @@ + #include "PortableServerC.i" + #endif /* !defined INLINE */ + ++char * ++PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id) ++{ ++ return TAO_POA::ObjectId_to_string (id); ++} ++ ++CORBA::WChar * ++PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id) ++{ ++ return TAO_POA::ObjectId_to_wstring (id); ++} ++ ++PortableServer::ObjectId * ++PortableServer::string_to_ObjectId (const char *id) ++{ ++ return TAO_POA::string_to_ObjectId (id); ++} ++ ++PortableServer::ObjectId * ++PortableServer::wstring_to_ObjectId (const CORBA::WChar *id) ++{ ++ return TAO_POA::wstring_to_ObjectId (id); ++} + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +@@ -268,6 +293,8 @@ + TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId) + TAO_NAMESPACE_END + ++#if (TAO_HAS_MINIMUM_CORBA == 0) ++ + // Default constructor. + PortableServer::ForwardRequest::ForwardRequest (void) + : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0") +@@ -438,6 +465,10 @@ + return ::PortableServer::_tc_ForwardRequest; + } + ++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ++ ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + // Default constructor. + PortableServer::NotAGroupObject::NotAGroupObject (void) + : CORBA_UserException ("IDL:omg.org/PortableServer/NotAGroupObject:1.0") +@@ -733,6 +764,8 @@ + TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IDs, &_tc_TAO_tc_PortableServer_IDs) + TAO_NAMESPACE_END + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (PortableServer) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16U) +@@ -761,6 +794,9 @@ + TAO_NAMESPACE_BEGIN (PortableServer) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22U) + TAO_NAMESPACE_END ++ ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order +@@ -1124,6 +1160,8 @@ + return "IDL:omg.org/PortableServer/ThreadPolicy:1.0"; + } + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order +@@ -2207,6 +2245,8 @@ + return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0"; + } + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order +@@ -3318,6 +3358,8 @@ + return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0"; + } + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + int PortableServer::POAManager::_tao_class_id = 0; + + PortableServer::POAManager_ptr +@@ -3697,6 +3739,7 @@ + ACE_THROW (CORBA::MARSHAL ()); + } + ++#if (TAO_HAS_MINIMUM_POA == 0) + int PortableServer::AdapterActivator::_tao_class_id = 0; + + PortableServer::AdapterActivator_ptr +@@ -4925,6 +4968,8 @@ + return "IDL:omg.org/PortableServer/ServantLocator:2.3"; + } + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + int PortableServer::POA::_tao_class_id = 0; + + PortableServer::POA_ptr +@@ -5470,6 +5515,8 @@ + this->index = _tao_index; + } + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + // Default constructor. + PortableServer::POA::NoServant::NoServant (void) + : CORBA_UserException ("IDL:omg.org/PortableServer/POA/NoServant:1.0") +@@ -5548,6 +5595,8 @@ + ACE_THROW (CORBA::MARSHAL ()); + } + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + // Default constructor. + PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void) + : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0") +@@ -6498,6 +6547,8 @@ + return 0; + } + ++#if (TAO_HAS_MINIMUM_CORBA == 0) ++ + void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying + { + TAO_OutputCDR stream; +@@ -6588,6 +6639,10 @@ + return 0; + } + ++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ++ ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying + { + TAO_OutputCDR stream; +@@ -6816,6 +6871,8 @@ + # pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue _tao_elem) + { + TAO_OutputCDR stream; +@@ -6957,6 +7014,8 @@ + # pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue _tao_elem) + { + TAO_OutputCDR stream; +@@ -7098,6 +7157,8 @@ + # pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>; +@@ -7105,6 +7166,8 @@ + # pragma instantiate TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>; +@@ -7133,6 +7196,8 @@ + # pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>; +@@ -7220,6 +7285,8 @@ + return 0; // error + } + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const PortableServer::IDs &_tao_sequence +@@ -7267,3 +7334,4 @@ + return 0; // error + } + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index c722caf2875..435c9bac814 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -15,6 +15,7 @@ #include "ace/pre.h" #include "corbafwd.h" +#include "Policy_ForwardC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl index b71cb4438c6..b3cc3b38d7d 100644 --- a/TAO/tao/RTCORBA/RTCORBA.pidl +++ b/TAO/tao/RTCORBA/RTCORBA.pidl @@ -1,60 +1,53 @@ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// RTCORBA.pidl -// -// = DESCRIPTION -// -// The RTCORBA module specified in CORBA v2.4.2 Chapter 24 -// (February, 2001). -// -// Changes to the original OMG idl: -// 1. Two TAO-specific interfaces, UnixDomainProtocolProperties -// and SharedMemoryProtocolProperties, have been added to allow -// configuration of TAO's UIOP and SHMEM pluggable protocols -// through RTCORBA Protocol Policies. -// 2. TAO-specific support for named mutexes has been added. -// 3. Added RT_ORB::create_tcp_protocol_properties which seems -// to come and go from the formal specification, but is needed. -// -// This file was used to generate the code in RTCORBAC.{h,i,cpp}. -// The steps to regenerate the code are as follows: -// -// 1. Run the tao_idl compiler on the pidl file. The command used for -// this is: -// -// tao_idl -o orig -Gp -Gd -Ge 1 -// -Wb,export_macro=TAO_RTCORBA_Export -// -Wb,export_include="rtcorba_export.h" -// -Wb,pre_include="ace/pre.h" -// -Wb,post_include="ace/post.h" -// RTCORBA.pidl -// -// 2. Then apply the patches in tao/RTCORBA/diffs to the generated code. -// The patches provide the following fixes: 1) remove several unnecessary -// includes, e.g., corba.h, stream.h, Policy.h, 3) add anything else we -// need into the namespace, i.e., TAO_Priority_Mapping, and 4) fix -// "nested_class" occurrences in the .cpp. -// -// Apply patches using the following commands: -// -// patch < diffs/RTCORBAC.h.diff -// patch < diffs/RTCORBAC.i.diff -// patch < diffs/RTCORBAC.cpp.diff -// -// Note: The diffs were generated with these commands: -// -// diff -wBbu orig/RTCORBAC.h RTCORBAC.h > diffs/RTCORBAC.h.diff -// diff -wBbu orig/RTCORBAC.i RTCORBAC.i > diffs/RTCORBAC.i.diff -// diff -wBbu orig/RTCORBAC.cpp RTCORBAC.cpp > diffs/RTCORBAC.cpp.diff -// -// ================================================================ +/** + * @file RTCORBA.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the RTCORBA module. + * + * The RTCORBA module specified in CORBA v2.4.2 Chapter 24 (February, + * 2001). + * + * Changes to the original OMG idl: + * + * 1. Two TAO-specific interfaces, UnixDomainProtocolProperties + * and SharedMemoryProtocolProperties, have been added to allow + * configuration of TAO's UIOP and SHMEM pluggable protocols + * through RTCORBA Protocol Policies. + * 2. TAO-specific support for named mutexes has been added. + * 3. Added RT_ORB::create_tcp_protocol_properties which seems + * to come and go from the formal specification, but is needed. + * + * This file was used to generate the code in RTCORBAC.{h,i,cpp}. + * The steps to regenerate the code are as follows: + * + * 1. Run the tao_idl compiler on the pidl file. The command used for + * this is: + * + * tao_idl -o orig -Gp -Gd -Ge 1 + * -Wb,export_macro=TAO_RTCORBA_Export + * -Wb,export_include="rtcorba_export.h" + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * RTCORBA.pidl + * + * 2. Then apply the patches in tao/RTCORBA/diffs to the generated code. + * The patches provide the following fixes: 1) remove several unnecessary + * includes, e.g., corba.h, stream.h, Policy.h, 3) add anything else we + * need into the namespace, i.e., TAO_Priority_Mapping, and 4) fix + * "nested_class" occurrences in the .cpp. + * + * Apply patches using the following commands: + * + * patch < diffs/RTCORBA.diff + * + * Note: The diffs were generated with these commands: + * + * for i in RTCORBAC.{h,i,cpp}; do + * diff -wBbu orig/$i $i + * done > diffs/RTCORBA.diff + * + */ #ifndef _RT_CORBA_IDL_ #define _RT_CORBA_IDL_ diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 90c2865f8a8..ee5cdb41c1b 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -19,9 +19,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" -#undef TAO_RTCORBA_SAFE_INCLUDE +#include "RTCORBA.h" #include "tao/Stub.h" #include "tao/Invocation.h" @@ -29,18 +27,33 @@ #if TAO_HAS_INTERCEPTORS == 1 #include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo.h" +#include "tao/ClientRequestInfo_i.h" #include "tao/ClientInterceptorAdapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) #include "RTCORBAC.i" #endif /* !defined INLINE */ +////////////////////////////////////////////////////// +// CDR Encoding Support + +CORBA::Boolean +RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &) +{ + return 1; +} + +CORBA::Boolean +RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) +{ + return 1; +} + static const CORBA::Long _oc_RTCORBA_NativePriority[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -74,7 +87,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NativePriority ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (RTCORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NativePriority, &_tc_TAO_tc_RTCORBA_NativePriority) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NativePriority, &_tc_TAO_tc_RTCORBA_NativePriority) TAO_NAMESPACE_END static const CORBA::Long _oc_RTCORBA_Priority[] = @@ -108,7 +121,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Priority ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (RTCORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Priority, &_tc_TAO_tc_RTCORBA_Priority) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Priority, &_tc_TAO_tc_RTCORBA_Priority) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::Short) @@ -152,7 +165,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolId ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (RTCORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadpoolId, &_tc_TAO_tc_RTCORBA_ThreadpoolId) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ThreadpoolId, &_tc_TAO_tc_RTCORBA_ThreadpoolId) TAO_NAMESPACE_END static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] = @@ -226,7 +239,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLane ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (RTCORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadpoolLane, &_tc_TAO_tc_RTCORBA_ThreadpoolLane) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ThreadpoolLane, &_tc_TAO_tc_RTCORBA_ThreadpoolLane) TAO_NAMESPACE_END void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer) @@ -241,42 +254,42 @@ void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer) #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CS_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CS_ - void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_allocate_buffer (CORBA::ULong length) - { - RTCORBA::ThreadpoolLane* tmp = 0; - tmp = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (length); +void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_allocate_buffer (CORBA::ULong length) +{ + RTCORBA::ThreadpoolLane* tmp = 0; + tmp = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (length); - if (this->buffer_ != 0) - { - RTCORBA::ThreadpoolLane *old = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *,this->buffer_); + if (this->buffer_ != 0) + { + RTCORBA::ThreadpoolLane *old = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *,this->buffer_); - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; - if (this->release_) - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (old); + if (this->release_) + _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (old); - } - this->buffer_ = tmp; } + this->buffer_ = tmp; +} - void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; +void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; - RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *,this->buffer_); + RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *,this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp); - this->buffer_ = 0; - } + _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp); + this->buffer_ = 0; +} - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void) // Dtor. - { - this->_deallocate_buffer (); - } +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ @@ -296,27 +309,27 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes (void) RTCORBA::ThreadpoolLanes::ThreadpoolLanes (CORBA::ULong max) // uses max size : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes +_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane> +TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} RTCORBA::ThreadpoolLanes::ThreadpoolLanes (CORBA::ULong max, CORBA::ULong length, RTCORBA::ThreadpoolLane *buffer, CORBA::Boolean release) : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes +_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane> +TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} RTCORBA::ThreadpoolLanes::ThreadpoolLanes (const ThreadpoolLanes &seq) // copy ctor : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes +_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane> +TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} @@ -427,7 +440,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLanes ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (RTCORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadpoolLanes, &_tc_TAO_tc_RTCORBA_ThreadpoolLanes) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ThreadpoolLanes, &_tc_TAO_tc_RTCORBA_ThreadpoolLanes) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) @@ -477,9 +490,11 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModel ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (RTCORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityModel, &_tc_TAO_tc_RTCORBA_PriorityModel) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PriorityModel, &_tc_TAO_tc_RTCORBA_PriorityModel) TAO_NAMESPACE_END +int RTCORBA::PriorityModelPolicy::_tao_class_id = 0; + RTCORBA::PriorityModelPolicy_ptr tao_RTCORBA_PriorityModelPolicy_duplicate ( RTCORBA::PriorityModelPolicy_ptr p @@ -523,10 +538,10 @@ tao_RTCORBA_PriorityModelPolicy_upcast ( return *tmp; } -int RTCORBA::PriorityModelPolicy::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::PriorityModelPolicy_var +// RTCORBA::PriorityModelPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (void) // default constructor @@ -649,7 +664,9 @@ RTCORBA::PriorityModelPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::PriorityModelPolicy_out +// RTCORBA::PriorityModelPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_ptr &p) @@ -708,12 +725,12 @@ RTCORBA::PriorityModelPolicy_out::operator-> (void) } -// default constructor -RTCORBA::PriorityModelPolicy::PriorityModelPolicy () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void) +{} -// destructor RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void) {} @@ -725,7 +742,8 @@ RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_narrow ( return PriorityModelPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_unchecked_narrow ( +RTCORBA::PriorityModelPolicy_ptr +RTCORBA::PriorityModelPolicy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -792,6 +810,8 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREADPOOL_POLICY_TYPE, 41U) TAO_NAMESPACE_END +int RTCORBA::ThreadpoolPolicy::_tao_class_id = 0; + RTCORBA::ThreadpoolPolicy_ptr tao_RTCORBA_ThreadpoolPolicy_duplicate ( RTCORBA::ThreadpoolPolicy_ptr p @@ -835,10 +855,10 @@ tao_RTCORBA_ThreadpoolPolicy_upcast ( return *tmp; } -int RTCORBA::ThreadpoolPolicy::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::ThreadpoolPolicy_var +// RTCORBA::ThreadpoolPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (void) // default constructor @@ -961,7 +981,9 @@ RTCORBA::ThreadpoolPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::ThreadpoolPolicy_out +// RTCORBA::ThreadpoolPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_ptr &p) @@ -1020,12 +1042,12 @@ RTCORBA::ThreadpoolPolicy_out::operator-> (void) } -// default constructor -RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void) +{} -// destructor RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void) {} @@ -1037,7 +1059,8 @@ RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_narrow ( return ThreadpoolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_unchecked_narrow ( +RTCORBA::ThreadpoolPolicy_ptr +RTCORBA::ThreadpoolPolicy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -1100,6 +1123,8 @@ const char* RTCORBA::ThreadpoolPolicy::_interface_repository_id (void) const return "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0"; } +int RTCORBA::ProtocolProperties::_tao_class_id = 0; + RTCORBA::ProtocolProperties_ptr tao_RTCORBA_ProtocolProperties_duplicate ( RTCORBA::ProtocolProperties_ptr p @@ -1143,10 +1168,10 @@ tao_RTCORBA_ProtocolProperties_upcast ( return *tmp; } -int RTCORBA::ProtocolProperties::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::ProtocolProperties_var +// RTCORBA::ProtocolProperties_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::ProtocolProperties_var::ProtocolProperties_var (void) // default constructor @@ -1269,7 +1294,9 @@ RTCORBA::ProtocolProperties_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::ProtocolProperties_out +// RTCORBA::ProtocolProperties_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr &p) @@ -1328,12 +1355,12 @@ RTCORBA::ProtocolProperties_out::operator-> (void) } -// default constructor -RTCORBA::ProtocolProperties::ProtocolProperties () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::ProtocolProperties::ProtocolProperties (void) +{} -// destructor RTCORBA::ProtocolProperties::~ProtocolProperties (void) {} @@ -1345,7 +1372,8 @@ RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow ( return ProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_unchecked_narrow ( +RTCORBA::ProtocolProperties_ptr +RTCORBA::ProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -1402,42 +1430,42 @@ const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_ - void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_allocate_buffer (CORBA::ULong length) - { - RTCORBA::Protocol* tmp = 0; - tmp = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (length); +void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_allocate_buffer (CORBA::ULong length) +{ + RTCORBA::Protocol* tmp = 0; + tmp = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (length); - if (this->buffer_ != 0) - { - RTCORBA::Protocol *old = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_); + if (this->buffer_ != 0) + { + RTCORBA::Protocol *old = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_); - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; - if (this->release_) - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (old); + if (this->release_) + _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (old); - } - this->buffer_ = tmp; } + this->buffer_ = tmp; +} - void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; +void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; - RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_); + RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp); - this->buffer_ = 0; - } + _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp); + this->buffer_ = 0; +} - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Dtor. - { - this->_deallocate_buffer (); - } +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ @@ -1457,27 +1485,27 @@ RTCORBA::ProtocolList::ProtocolList (void) RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max) // uses max size : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList +_TAO_Unbounded_Sequence_RTCORBA_ProtocolList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::Protocol> +TAO_Unbounded_Sequence<RTCORBA::Protocol> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max, CORBA::ULong length, RTCORBA::Protocol *buffer, CORBA::Boolean release) : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList +_TAO_Unbounded_Sequence_RTCORBA_ProtocolList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::Protocol> +TAO_Unbounded_Sequence<RTCORBA::Protocol> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} RTCORBA::ProtocolList::ProtocolList (const ProtocolList &seq) // copy ctor : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList +_TAO_Unbounded_Sequence_RTCORBA_ProtocolList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::Protocol> +TAO_Unbounded_Sequence<RTCORBA::Protocol> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} @@ -1496,6 +1524,8 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVER_PROTOCOL_POLICY_TYPE, 42U) TAO_NAMESPACE_END +int RTCORBA::ServerProtocolPolicy::_tao_class_id = 0; + RTCORBA::ServerProtocolPolicy_ptr tao_RTCORBA_ServerProtocolPolicy_duplicate ( RTCORBA::ServerProtocolPolicy_ptr p @@ -1539,10 +1569,10 @@ tao_RTCORBA_ServerProtocolPolicy_upcast ( return *tmp; } -int RTCORBA::ServerProtocolPolicy::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::ServerProtocolPolicy_var +// RTCORBA::ServerProtocolPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (void) // default constructor @@ -1665,7 +1695,9 @@ RTCORBA::ServerProtocolPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::ServerProtocolPolicy_out +// RTCORBA::ServerProtocolPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &p) @@ -1724,12 +1756,12 @@ RTCORBA::ServerProtocolPolicy_out::operator-> (void) } -// default constructor -RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void) +{} -// destructor RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void) {} @@ -1741,7 +1773,8 @@ RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow ( return ServerProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_unchecked_narrow ( +RTCORBA::ServerProtocolPolicy_ptr +RTCORBA::ServerProtocolPolicy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -1808,6 +1841,8 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PROTOCOL_POLICY_TYPE, 43U) TAO_NAMESPACE_END +int RTCORBA::ClientProtocolPolicy::_tao_class_id = 0; + RTCORBA::ClientProtocolPolicy_ptr tao_RTCORBA_ClientProtocolPolicy_duplicate ( RTCORBA::ClientProtocolPolicy_ptr p @@ -1851,10 +1886,10 @@ tao_RTCORBA_ClientProtocolPolicy_upcast ( return *tmp; } -int RTCORBA::ClientProtocolPolicy::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::ClientProtocolPolicy_var +// RTCORBA::ClientProtocolPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (void) // default constructor @@ -1977,7 +2012,9 @@ RTCORBA::ClientProtocolPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::ClientProtocolPolicy_out +// RTCORBA::ClientProtocolPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &p) @@ -2036,12 +2073,12 @@ RTCORBA::ClientProtocolPolicy_out::operator-> (void) } -// default constructor -RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void) +{} -// destructor RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void) {} @@ -2053,7 +2090,8 @@ RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow ( return ClientProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_unchecked_narrow ( +RTCORBA::ClientProtocolPolicy_ptr +RTCORBA::ClientProtocolPolicy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -2120,6 +2158,8 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIVATE_CONNECTION_POLICY_TYPE, 44U) TAO_NAMESPACE_END +int RTCORBA::PrivateConnectionPolicy::_tao_class_id = 0; + RTCORBA::PrivateConnectionPolicy_ptr tao_RTCORBA_PrivateConnectionPolicy_duplicate ( RTCORBA::PrivateConnectionPolicy_ptr p @@ -2163,10 +2203,10 @@ tao_RTCORBA_PrivateConnectionPolicy_upcast ( return *tmp; } -int RTCORBA::PrivateConnectionPolicy::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::PrivateConnectionPolicy_var +// RTCORBA::PrivateConnectionPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (void) // default constructor @@ -2289,7 +2329,9 @@ RTCORBA::PrivateConnectionPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::PrivateConnectionPolicy_out +// RTCORBA::PrivateConnectionPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &p) @@ -2348,12 +2390,12 @@ RTCORBA::PrivateConnectionPolicy_out::operator-> (void) } -// default constructor -RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void) +{} -// destructor RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void) {} @@ -2365,7 +2407,8 @@ RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow ( return PrivateConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_unchecked_narrow ( +RTCORBA::PrivateConnectionPolicy_ptr +RTCORBA::PrivateConnectionPolicy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -2428,6 +2471,8 @@ const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) co return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0"; } +int RTCORBA::TCPProtocolProperties::_tao_class_id = 0; + RTCORBA::TCPProtocolProperties_ptr tao_RTCORBA_TCPProtocolProperties_duplicate ( RTCORBA::TCPProtocolProperties_ptr p @@ -2471,10 +2516,10 @@ tao_RTCORBA_TCPProtocolProperties_upcast ( return *tmp; } -int RTCORBA::TCPProtocolProperties::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::TCPProtocolProperties_var +// RTCORBA::TCPProtocolProperties_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (void) // default constructor @@ -2597,7 +2642,9 @@ RTCORBA::TCPProtocolProperties_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::TCPProtocolProperties_out +// RTCORBA::TCPProtocolProperties_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_ptr &p) @@ -2655,28 +2702,12 @@ RTCORBA::TCPProtocolProperties_out::operator-> (void) return this->ptr_; } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 -////////////////////////////////////////////////////// -// CDR Encoding Support - -CORBA::Boolean -RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &) -{ - return 1; -} - -CORBA::Boolean -RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) -{ - return 1; -} - -// default constructor -RTCORBA::TCPProtocolProperties::TCPProtocolProperties () -{ - } +RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void) +{} -// destructor RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void) {} @@ -2688,7 +2719,8 @@ RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_narrow ( return TCPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_unchecked_narrow ( +RTCORBA::TCPProtocolProperties_ptr +RTCORBA::TCPProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -2751,6 +2783,8 @@ const char* RTCORBA::TCPProtocolProperties::_interface_repository_id (void) cons return "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0"; } +int RTCORBA::GIOPProtocolProperties::_tao_class_id = 0; + RTCORBA::GIOPProtocolProperties_ptr tao_RTCORBA_GIOPProtocolProperties_duplicate ( RTCORBA::GIOPProtocolProperties_ptr p @@ -2794,10 +2828,10 @@ tao_RTCORBA_GIOPProtocolProperties_upcast ( return *tmp; } -int RTCORBA::GIOPProtocolProperties::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::GIOPProtocolProperties_var +// RTCORBA::GIOPProtocolProperties_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (void) // default constructor @@ -2920,7 +2954,9 @@ RTCORBA::GIOPProtocolProperties_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::GIOPProtocolProperties_out +// RTCORBA::GIOPProtocolProperties_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_ptr &p) @@ -2979,12 +3015,12 @@ RTCORBA::GIOPProtocolProperties_out::operator-> (void) } -// default constructor -RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void) +{} -// destructor RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void) {} @@ -2996,7 +3032,8 @@ RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_narrow ( return GIOPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_unchecked_narrow ( +RTCORBA::GIOPProtocolProperties_ptr +RTCORBA::GIOPProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -3059,6 +3096,8 @@ const char* RTCORBA::GIOPProtocolProperties::_interface_repository_id (void) con return "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0"; } +int RTCORBA::UnixDomainProtocolProperties::_tao_class_id = 0; + RTCORBA::UnixDomainProtocolProperties_ptr tao_RTCORBA_UnixDomainProtocolProperties_duplicate ( RTCORBA::UnixDomainProtocolProperties_ptr p @@ -3102,10 +3141,10 @@ tao_RTCORBA_UnixDomainProtocolProperties_upcast ( return *tmp; } -int RTCORBA::UnixDomainProtocolProperties::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::UnixDomainProtocolProperties_var +// RTCORBA::UnixDomainProtocolProperties_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (void) // default constructor @@ -3228,7 +3267,9 @@ RTCORBA::UnixDomainProtocolProperties_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::UnixDomainProtocolProperties_out +// RTCORBA::UnixDomainProtocolProperties_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &p) @@ -3287,12 +3328,12 @@ RTCORBA::UnixDomainProtocolProperties_out::operator-> (void) } -// default constructor -RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void) +{} -// destructor RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void) {} @@ -3304,7 +3345,8 @@ RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties: return UnixDomainProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( +RTCORBA::UnixDomainProtocolProperties_ptr +RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -3367,6 +3409,8 @@ const char* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (voi return "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0"; } +int RTCORBA::SharedMemoryProtocolProperties::_tao_class_id = 0; + RTCORBA::SharedMemoryProtocolProperties_ptr tao_RTCORBA_SharedMemoryProtocolProperties_duplicate ( RTCORBA::SharedMemoryProtocolProperties_ptr p @@ -3410,10 +3454,10 @@ tao_RTCORBA_SharedMemoryProtocolProperties_upcast ( return *tmp; } -int RTCORBA::SharedMemoryProtocolProperties::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::SharedMemoryProtocolProperties_var +// RTCORBA::SharedMemoryProtocolProperties_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (void) // default constructor @@ -3536,7 +3580,9 @@ RTCORBA::SharedMemoryProtocolProperties_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::SharedMemoryProtocolProperties_out +// RTCORBA::SharedMemoryProtocolProperties_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &p) @@ -3595,12 +3641,12 @@ RTCORBA::SharedMemoryProtocolProperties_out::operator-> (void) } -// default constructor -RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void) +{} -// destructor RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void) {} @@ -3612,7 +3658,8 @@ RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolPropert return SharedMemoryProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( +RTCORBA::SharedMemoryProtocolProperties_ptr +RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -3720,26 +3767,8 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] = 5, ACE_NTOHL (0x68696768), ACE_NTOHL (0x0), // name = high - 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 (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 - 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x0), // name = Priority - CORBA::tk_short, - - + 0xffffffff, // indirection + 0xffffffa8, // negative offset (-88) }; static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand ( @@ -3752,7 +3781,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (RTCORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityBand, &_tc_TAO_tc_RTCORBA_PriorityBand) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PriorityBand, &_tc_TAO_tc_RTCORBA_PriorityBand) TAO_NAMESPACE_END void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer) @@ -3767,42 +3796,42 @@ void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer) #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CS_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CS_ - void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_allocate_buffer (CORBA::ULong length) - { - RTCORBA::PriorityBand* tmp = 0; - tmp = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (length); +void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_allocate_buffer (CORBA::ULong length) +{ + RTCORBA::PriorityBand* tmp = 0; + tmp = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (length); - if (this->buffer_ != 0) - { - RTCORBA::PriorityBand *old = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_); + if (this->buffer_ != 0) + { + RTCORBA::PriorityBand *old = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_); - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; - if (this->release_) - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (old); + if (this->release_) + _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (old); - } - this->buffer_ = tmp; } + this->buffer_ = tmp; +} - void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; +void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_deallocate_buffer (void) +{ + if (this->buffer_ == 0 || this->release_ == 0) + return; - RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_); + RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp); - this->buffer_ = 0; - } + _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp); + this->buffer_ = 0; +} - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Dtor. - { - this->_deallocate_buffer (); - } +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Dtor. +{ + this->_deallocate_buffer (); +} #endif /* end #if !defined */ @@ -3822,27 +3851,27 @@ RTCORBA::PriorityBands::PriorityBands (void) RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max) // uses max size : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands +_TAO_Unbounded_Sequence_RTCORBA_PriorityBands #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::PriorityBand> +TAO_Unbounded_Sequence<RTCORBA::PriorityBand> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max, CORBA::ULong length, RTCORBA::PriorityBand *buffer, CORBA::Boolean release) : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands +_TAO_Unbounded_Sequence_RTCORBA_PriorityBands #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::PriorityBand> +TAO_Unbounded_Sequence<RTCORBA::PriorityBand> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} RTCORBA::PriorityBands::PriorityBands (const PriorityBands &seq) // copy ctor : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands +_TAO_Unbounded_Sequence_RTCORBA_PriorityBands #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<RTCORBA::PriorityBand> +TAO_Unbounded_Sequence<RTCORBA::PriorityBand> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} @@ -3877,10 +3906,10 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] = ACE_NTOHL (0x42616e64), ACE_NTOHL (0x73000000), // name = PriorityBands CORBA::tk_sequence, // typecode kind - 252, // encapsulation length + 188, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 236, // encapsulation length + 172, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 37, ACE_NTOHL (0x49444c3a), @@ -3924,26 +3953,8 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] = 5, ACE_NTOHL (0x68696768), ACE_NTOHL (0x0), // name = high - 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 (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 - 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x0), // name = Priority - CORBA::tk_short, - - + 0xffffffff, // indirection + 0xffffffa8, // negative offset (-88) 0U, @@ -3959,13 +3970,15 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (RTCORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityBands, &_tc_TAO_tc_RTCORBA_PriorityBands) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PriorityBands, &_tc_TAO_tc_RTCORBA_PriorityBands) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_BANDED_CONNECTION_POLICY_TYPE, 45U) TAO_NAMESPACE_END +int RTCORBA::PriorityBandedConnectionPolicy::_tao_class_id = 0; + RTCORBA::PriorityBandedConnectionPolicy_ptr tao_RTCORBA_PriorityBandedConnectionPolicy_duplicate ( RTCORBA::PriorityBandedConnectionPolicy_ptr p @@ -4009,10 +4022,10 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_upcast ( return *tmp; } -int RTCORBA::PriorityBandedConnectionPolicy::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::PriorityBandedConnectionPolicy_var +// RTCORBA::PriorityBandedConnectionPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (void) // default constructor @@ -4135,7 +4148,9 @@ RTCORBA::PriorityBandedConnectionPolicy_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::PriorityBandedConnectionPolicy_out +// RTCORBA::PriorityBandedConnectionPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &p) @@ -4194,12 +4209,12 @@ RTCORBA::PriorityBandedConnectionPolicy_out::operator-> (void) } -// default constructor -RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void) +{} -// destructor RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void) {} @@ -4211,7 +4226,8 @@ RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPol return PriorityBandedConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow ( +RTCORBA::PriorityBandedConnectionPolicy_ptr +RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -4274,6 +4290,8 @@ const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (v return "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0"; } +int RTCORBA::Current::_tao_class_id = 0; + RTCORBA::Current_ptr tao_RTCORBA_Current_duplicate ( RTCORBA::Current_ptr p @@ -4317,10 +4335,10 @@ tao_RTCORBA_Current_upcast ( return *tmp; } -int RTCORBA::Current::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::Current_var +// RTCORBA::Current_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::Current_var::Current_var (void) // default constructor @@ -4443,7 +4461,9 @@ RTCORBA::Current_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::Current_out +// RTCORBA::Current_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::Current_out::Current_out (Current_ptr &p) @@ -4502,12 +4522,12 @@ RTCORBA::Current_out::operator-> (void) } -// default constructor -RTCORBA::Current::Current () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::Current::Current (void) +{} -// destructor RTCORBA::Current::~Current (void) {} @@ -4519,7 +4539,8 @@ RTCORBA::Current_ptr RTCORBA::Current::_narrow ( return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::Current_ptr RTCORBA::Current::_unchecked_narrow ( +RTCORBA::Current_ptr +RTCORBA::Current::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -4582,6 +4603,8 @@ const char* RTCORBA::Current::_interface_repository_id (void) const return "IDL:omg.org/RTCORBA/Current:1.0"; } +int RTCORBA::Mutex::_tao_class_id = 0; + RTCORBA::Mutex_ptr tao_RTCORBA_Mutex_duplicate ( RTCORBA::Mutex_ptr p @@ -4625,10 +4648,10 @@ tao_RTCORBA_Mutex_upcast ( return *tmp; } -int RTCORBA::Mutex::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::Mutex_var +// RTCORBA::Mutex_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::Mutex_var::Mutex_var (void) // default constructor @@ -4751,7 +4774,9 @@ RTCORBA::Mutex_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::Mutex_out +// RTCORBA::Mutex_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::Mutex_out::Mutex_out (Mutex_ptr &p) @@ -4810,12 +4835,12 @@ RTCORBA::Mutex_out::operator-> (void) } -// default constructor -RTCORBA::Mutex::Mutex () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::Mutex::Mutex (void) +{} -// destructor RTCORBA::Mutex::~Mutex (void) {} @@ -4827,7 +4852,8 @@ RTCORBA::Mutex_ptr RTCORBA::Mutex::_narrow ( return Mutex::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::Mutex_ptr RTCORBA::Mutex::_unchecked_narrow ( +RTCORBA::Mutex_ptr +RTCORBA::Mutex::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -4878,6 +4904,8 @@ const char* RTCORBA::Mutex::_interface_repository_id (void) const return "IDL:omg.org/RTCORBA/Mutex:1.0"; } +int RTCORBA::RTORB::_tao_class_id = 0; + RTCORBA::RTORB_ptr tao_RTCORBA_RTORB_duplicate ( RTCORBA::RTORB_ptr p @@ -4921,10 +4949,10 @@ tao_RTCORBA_RTORB_upcast ( return *tmp; } -int RTCORBA::RTORB::_tao_class_id = 0; - // ************************************************************* -// Operations for class RTCORBA::RTORB_var +// RTCORBA::RTORB_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* RTCORBA::RTORB_var::RTORB_var (void) // default constructor @@ -5047,7 +5075,9 @@ RTCORBA::RTORB_var::tao_upcast (void *src) } // ************************************************************* -// Operations for class RTCORBA::RTORB_out +// RTCORBA::RTORB_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* RTCORBA::RTORB_out::RTORB_out (RTORB_ptr &p) @@ -5106,12 +5136,12 @@ RTCORBA::RTORB_out::operator-> (void) } -// default constructor -RTCORBA::RTORB::RTORB () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:209 + +RTCORBA::RTORB::RTORB (void) +{} -// destructor RTCORBA::RTORB::~RTORB (void) {} @@ -5123,7 +5153,8 @@ RTCORBA::RTORB_ptr RTCORBA::RTORB::_narrow ( return RTORB::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -RTCORBA::RTORB_ptr RTCORBA::RTORB::_unchecked_narrow ( +RTCORBA::RTORB_ptr +RTCORBA::RTORB::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -5199,7 +5230,6 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound return *this; } -// Narrow. RTCORBA::RTORB::MutexNotFound * RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *exc) { @@ -5213,6 +5243,25 @@ RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *exc) } } +CORBA::Exception *RTCORBA::RTORB::MutexNotFound::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::RTCORBA::RTORB::MutexNotFound, 0); + return retval; +} + +CORBA::Exception * +RTCORBA::RTORB::MutexNotFound::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + RTCORBA::RTORB::MutexNotFound (*this), + 0 + ); + return result; +} + void RTCORBA::RTORB::MutexNotFound::_raise () { TAO_RAISE (*this); @@ -5234,14 +5283,6 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *RTCORBA::RTORB::MutexNotFound::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::RTCORBA::RTORB::MutexNotFound, 0); - return retval; -} - // Default constructor. RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void) : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0") @@ -5267,9 +5308,8 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr return *this; } -// Narrow. RTCORBA::RTORB::InvalidThreadpool * -RTCORBA::RTORB::InvalidThreadpool::_narrow (CORBA::Exception *exc) +RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_id ())) { @@ -5281,6 +5321,25 @@ RTCORBA::RTORB::InvalidThreadpool::_narrow (CORBA::Exception *exc) } } +CORBA::Exception *RTCORBA::RTORB::InvalidThreadpool::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::RTCORBA::RTORB::InvalidThreadpool, 0); + return retval; +} + +CORBA::Exception * +RTCORBA::RTORB::InvalidThreadpool::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + RTCORBA::RTORB::InvalidThreadpool (*this), + 0 + ); + return result; +} + void RTCORBA::RTORB::InvalidThreadpool::_raise () { TAO_RAISE (*this); @@ -5302,14 +5361,6 @@ void RTCORBA::RTORB::InvalidThreadpool::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -// TAO extension - the _alloc method. -CORBA::Exception *RTCORBA::RTORB::InvalidThreadpool::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::RTCORBA::RTORB::InvalidThreadpool, 0); - return retval; -} - void operator<<= (CORBA::Any &_tao_any, const RTCORBA::ThreadpoolLane &_tao_elem) // copying { TAO_OutputCDR stream; @@ -5889,4 +5940,3 @@ CORBA::Boolean operator>> ( } return 0; // error } - diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 77c8a3cbd10..f8c164effd3 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -33,7 +33,6 @@ #include "tao/IOPC.h" #include "tao/TimeBaseC.h" #include "tao/PolicyC.h" -#include "tao/Encodable.h" // Forward references. class TAO_Priority_Mapping_Manager; @@ -45,7 +44,6 @@ class TAO_Priority_Mapping; #error "You should not include RTCORBAC.h directly, use RTCORBA.h" #endif /* !TAO_RTCORBA_SAFE_INCLUDE */ - #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif @@ -76,24 +74,25 @@ TAO_NAMESPACE RTCORBA typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr; typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var; typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out; + + typedef TAO_Priority_Mapping PriorityMapping; // End TAO-specific typedef CORBA::Short NativePriority; typedef CORBA::Short_out NativePriority_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NativePriority; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority; typedef CORBA::Short Priority; typedef CORBA::Short_out Priority_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Priority; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short minPriority; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short maxPriority; - typedef TAO_Priority_Mapping PriorityMapping; typedef CORBA::ULong ThreadpoolId; typedef CORBA::ULong_out ThreadpoolId_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadpoolId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId; struct ThreadpoolLane; class ThreadpoolLane_var; @@ -147,7 +146,7 @@ TAO_NAMESPACE RTCORBA typedef ThreadpoolLane &ThreadpoolLane_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadpoolLane; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -155,13 +154,13 @@ TAO_NAMESPACE RTCORBA #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CH_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. + { + public: + // = Initialization and termination methods. _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void); - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum); _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes ( CORBA::ULong maximum, CORBA::ULong length, @@ -176,26 +175,26 @@ TAO_NAMESPACE RTCORBA ); virtual ~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void); - // = Accessors. - ThreadpoolLane &operator[] (CORBA::ULong i); - const ThreadpoolLane &operator[] (CORBA::ULong i) const; + // = Accessors. + ThreadpoolLane &operator[] (CORBA::ULong i); + const ThreadpoolLane &operator[] (CORBA::ULong i) const; - // = Static operations. - static ThreadpoolLane *allocbuf (CORBA::ULong size); - static void freebuf (ThreadpoolLane *buffer); + // = Static operations. + static ThreadpoolLane *allocbuf (CORBA::ULong size); + static void freebuf (ThreadpoolLane *buffer); // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - ThreadpoolLane *get_buffer (CORBA::Boolean orphan = 0); - const ThreadpoolLane *get_buffer (void) const; + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + ThreadpoolLane *get_buffer (CORBA::Boolean orphan = 0); + const ThreadpoolLane *get_buffer (void) const; void replace ( CORBA::ULong max, CORBA::ULong length, ThreadpoolLane *data, CORBA::Boolean release ); - }; + }; #endif /* end #if !defined */ @@ -214,20 +213,20 @@ TAO_NAMESPACE RTCORBA class TAO_RTCORBA_Export ThreadpoolLanes : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes + _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<ThreadpoolLane> + TAO_Unbounded_Sequence<ThreadpoolLane> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: ThreadpoolLanes (void); // default ctor ThreadpoolLanes (CORBA::ULong max); // uses max size ThreadpoolLanes ( - CORBA::ULong max, - CORBA::ULong length, - ThreadpoolLane *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + ThreadpoolLane *buffer, + CORBA::Boolean release = 0 + ); ThreadpoolLanes (const ThreadpoolLanes &); // copy ctor ~ThreadpoolLanes (void); static void _tao_any_destructor (void*); @@ -313,18 +312,18 @@ TAO_NAMESPACE RTCORBA #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadpoolLanes; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIORITY_MODEL_POLICY_TYPE; enum PriorityModel { - CLIENT_PROPAGATED, - SERVER_DECLARED + CLIENT_PROPAGATED, + SERVER_DECLARED }; typedef PriorityModel &PriorityModel_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityModel; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel; #if !defined (_RTCORBA_PRIORITYMODELPOLICY___PTR_CH_) @@ -418,36 +417,38 @@ TAO_NAMESPACE RTCORBA typedef PriorityModelPolicy_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj); static PriorityModelPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PriorityModelPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PriorityModelPolicy_ptr _nil (void) { return (PriorityModelPolicy_ptr)0; } - virtual RTCORBA::PriorityModel priority_model ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual ::RTCORBA::PriorityModel priority_model ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual RTCORBA::Priority server_priority ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -457,7 +458,7 @@ TAO_NAMESPACE RTCORBA virtual const char* _interface_repository_id (void) const; protected: - PriorityModelPolicy (); + PriorityModelPolicy (void); virtual ~PriorityModelPolicy (void); @@ -563,20 +564,20 @@ TAO_NAMESPACE RTCORBA typedef ThreadpoolPolicy_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj); static ThreadpoolPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ThreadpoolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ThreadpoolPolicy_ptr _nil (void) { @@ -584,8 +585,9 @@ TAO_NAMESPACE RTCORBA } virtual RTCORBA::ThreadpoolId threadpool ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -595,7 +597,7 @@ TAO_NAMESPACE RTCORBA virtual const char* _interface_repository_id (void) const; protected: - ThreadpoolPolicy (); + ThreadpoolPolicy (void); virtual ~ThreadpoolPolicy (void); @@ -690,9 +692,9 @@ TAO_NAMESPACE RTCORBA #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_) #define _RTCORBA_PROTOCOLPROPERTIES_CH_ -class TAO_RTCORBA_Export ProtocolProperties - : public virtual CORBA_Object, - public TAO_Encodable + class TAO_RTCORBA_Export ProtocolProperties + : public virtual CORBA_Object + , public TAO_Encodable { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -700,20 +702,20 @@ class TAO_RTCORBA_Export ProtocolProperties typedef ProtocolProperties_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj); static ProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ProtocolProperties_ptr _nil (void) { @@ -730,7 +732,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: - ProtocolProperties (); + ProtocolProperties (void); virtual ~ProtocolProperties (void); @@ -752,7 +754,7 @@ class TAO_RTCORBA_Export ProtocolProperties typedef Protocol_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - IOP::ProfileId protocol_type; + IOP::ProfileId protocol_type; ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) orb_protocol_properties; ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) transport_protocol_properties; @@ -812,13 +814,13 @@ class TAO_RTCORBA_Export ProtocolProperties #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_ProtocolList + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_RTCORBA_ProtocolList : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. + { + public: + // = Initialization and termination methods. _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void); - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum); _TAO_Unbounded_Sequence_RTCORBA_ProtocolList ( CORBA::ULong maximum, CORBA::ULong length, @@ -833,26 +835,26 @@ class TAO_RTCORBA_Export ProtocolProperties ); virtual ~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void); - // = Accessors. - Protocol &operator[] (CORBA::ULong i); - const Protocol &operator[] (CORBA::ULong i) const; + // = Accessors. + Protocol &operator[] (CORBA::ULong i); + const Protocol &operator[] (CORBA::ULong i) const; - // = Static operations. - static Protocol *allocbuf (CORBA::ULong size); - static void freebuf (Protocol *buffer); + // = Static operations. + static Protocol *allocbuf (CORBA::ULong size); + static void freebuf (Protocol *buffer); // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - Protocol *get_buffer (CORBA::Boolean orphan = 0); - const Protocol *get_buffer (void) const; + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + Protocol *get_buffer (CORBA::Boolean orphan = 0); + const Protocol *get_buffer (void) const; void replace ( CORBA::ULong max, CORBA::ULong length, Protocol *data, CORBA::Boolean release ); - }; + }; #endif /* end #if !defined */ @@ -871,20 +873,20 @@ class TAO_RTCORBA_Export ProtocolProperties class TAO_RTCORBA_Export ProtocolList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList + _TAO_Unbounded_Sequence_RTCORBA_ProtocolList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<Protocol> + TAO_Unbounded_Sequence<Protocol> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: ProtocolList (void); // default ctor ProtocolList (CORBA::ULong max); // uses max size ProtocolList ( - CORBA::ULong max, - CORBA::ULong length, - Protocol *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + Protocol *buffer, + CORBA::Boolean release = 0 + ); ProtocolList (const ProtocolList &); // copy ctor ~ProtocolList (void); static void _tao_any_destructor (void*); @@ -1061,29 +1063,30 @@ class TAO_RTCORBA_Export ProtocolProperties typedef ServerProtocolPolicy_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj); static ServerProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ServerProtocolPolicy_ptr _nil (void) { return (ServerProtocolPolicy_ptr)0; } - virtual RTCORBA::ProtocolList * protocols ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual ::RTCORBA::ProtocolList * protocols ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -1093,7 +1096,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - ServerProtocolPolicy (); + ServerProtocolPolicy (void); virtual ~ServerProtocolPolicy (void); @@ -1199,29 +1202,30 @@ class TAO_RTCORBA_Export ProtocolProperties typedef ClientProtocolPolicy_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj); static ClientProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ClientProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static ClientProtocolPolicy_ptr _nil (void) { return (ClientProtocolPolicy_ptr)0; } - virtual RTCORBA::ProtocolList * protocols ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual ::RTCORBA::ProtocolList * protocols ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -1231,7 +1235,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - ClientProtocolPolicy (); + ClientProtocolPolicy (void); virtual ~ClientProtocolPolicy (void); @@ -1337,20 +1341,20 @@ class TAO_RTCORBA_Export ProtocolProperties typedef PrivateConnectionPolicy_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj); static PrivateConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PrivateConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PrivateConnectionPolicy_ptr _nil (void) { @@ -1362,7 +1366,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - PrivateConnectionPolicy (); + PrivateConnectionPolicy (void); virtual ~PrivateConnectionPolicy (void); @@ -1458,7 +1462,7 @@ class TAO_RTCORBA_Export ProtocolProperties #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_ class TAO_RTCORBA_Export TCPProtocolProperties - : public virtual ProtocolProperties + : public virtual RTCORBA::ProtocolProperties { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1466,20 +1470,20 @@ class TAO_RTCORBA_Export ProtocolProperties typedef TCPProtocolProperties_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj); static TCPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static TCPProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static TCPProtocolProperties_ptr _nil (void) { @@ -1487,76 +1491,81 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual CORBA::Long send_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void send_buffer_size ( CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Long recv_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void recv_buffer_size ( CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Boolean keep_alive ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void keep_alive ( CORBA::Boolean keep_alive - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Boolean dont_route ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void dont_route ( CORBA::Boolean dont_route - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Boolean no_delay ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void no_delay ( CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -1566,7 +1575,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - TCPProtocolProperties (); + TCPProtocolProperties (void); virtual ~TCPProtocolProperties (void); @@ -1662,7 +1671,7 @@ class TAO_RTCORBA_Export ProtocolProperties #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_ class TAO_RTCORBA_Export GIOPProtocolProperties - : public virtual ProtocolProperties + : public virtual RTCORBA::ProtocolProperties { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1670,20 +1679,20 @@ class TAO_RTCORBA_Export ProtocolProperties typedef GIOPProtocolProperties_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj); static GIOPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static GIOPProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static GIOPProtocolProperties_ptr _nil (void) { @@ -1695,7 +1704,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - GIOPProtocolProperties (); + GIOPProtocolProperties (void); virtual ~GIOPProtocolProperties (void); @@ -1791,7 +1800,7 @@ class TAO_RTCORBA_Export ProtocolProperties #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_ class TAO_RTCORBA_Export UnixDomainProtocolProperties - : public virtual ProtocolProperties + : public virtual RTCORBA::ProtocolProperties { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1799,20 +1808,20 @@ class TAO_RTCORBA_Export ProtocolProperties typedef UnixDomainProtocolProperties_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj); static UnixDomainProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static UnixDomainProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static UnixDomainProtocolProperties_ptr _nil (void) { @@ -1820,31 +1829,33 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual CORBA::Long send_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void send_buffer_size ( CORBA::Long send_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Long recv_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void recv_buffer_size ( CORBA::Long recv_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -1854,7 +1865,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - UnixDomainProtocolProperties (); + UnixDomainProtocolProperties (void); virtual ~UnixDomainProtocolProperties (void); @@ -1950,7 +1961,7 @@ class TAO_RTCORBA_Export ProtocolProperties #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_ class TAO_RTCORBA_Export SharedMemoryProtocolProperties - : public virtual ProtocolProperties + : public virtual RTCORBA::ProtocolProperties { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1958,20 +1969,20 @@ class TAO_RTCORBA_Export ProtocolProperties typedef SharedMemoryProtocolProperties_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj); static SharedMemoryProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static SharedMemoryProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static SharedMemoryProtocolProperties_ptr _nil (void) { @@ -1979,46 +1990,49 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual CORBA::Long preallocate_buffer_size ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void preallocate_buffer_size ( CORBA::Long preallocate_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual char * mmap_filename ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void mmap_filename ( const char * mmap_filename - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual char * mmap_lockname ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void mmap_lockname ( const char * mmap_lockname - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -2028,7 +2042,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - SharedMemoryProtocolProperties (); + SharedMemoryProtocolProperties (void); virtual ~SharedMemoryProtocolProperties (void); @@ -2091,7 +2105,7 @@ class TAO_RTCORBA_Export ProtocolProperties typedef PriorityBand &PriorityBand_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityBand; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBand; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -2099,13 +2113,13 @@ class TAO_RTCORBA_Export ProtocolProperties #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_PriorityBands + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_RTCORBA_PriorityBands : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. + { + public: + // = Initialization and termination methods. _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void); - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum); _TAO_Unbounded_Sequence_RTCORBA_PriorityBands ( CORBA::ULong maximum, CORBA::ULong length, @@ -2120,26 +2134,26 @@ class TAO_RTCORBA_Export ProtocolProperties ); virtual ~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void); - // = Accessors. - PriorityBand &operator[] (CORBA::ULong i); - const PriorityBand &operator[] (CORBA::ULong i) const; + // = Accessors. + PriorityBand &operator[] (CORBA::ULong i); + const PriorityBand &operator[] (CORBA::ULong i) const; - // = Static operations. - static PriorityBand *allocbuf (CORBA::ULong size); - static void freebuf (PriorityBand *buffer); + // = Static operations. + static PriorityBand *allocbuf (CORBA::ULong size); + static void freebuf (PriorityBand *buffer); // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - PriorityBand *get_buffer (CORBA::Boolean orphan = 0); - const PriorityBand *get_buffer (void) const; + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + PriorityBand *get_buffer (CORBA::Boolean orphan = 0); + const PriorityBand *get_buffer (void) const; void replace ( CORBA::ULong max, CORBA::ULong length, PriorityBand *data, CORBA::Boolean release ); - }; + }; #endif /* end #if !defined */ @@ -2158,20 +2172,20 @@ class TAO_RTCORBA_Export ProtocolProperties class TAO_RTCORBA_Export PriorityBands : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands + _TAO_Unbounded_Sequence_RTCORBA_PriorityBands #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<PriorityBand> + TAO_Unbounded_Sequence<PriorityBand> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: PriorityBands (void); // default ctor PriorityBands (CORBA::ULong max); // uses max size PriorityBands ( - CORBA::ULong max, - CORBA::ULong length, - PriorityBand *buffer, - CORBA::Boolean release = 0 - ); + CORBA::ULong max, + CORBA::ULong length, + PriorityBand *buffer, + CORBA::Boolean release = 0 + ); PriorityBands (const PriorityBands &); // copy ctor ~PriorityBands (void); static void _tao_any_destructor (void*); @@ -2257,7 +2271,7 @@ class TAO_RTCORBA_Export ProtocolProperties #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityBands; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBands; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIORITY_BANDED_CONNECTION_POLICY_TYPE; @@ -2353,29 +2367,30 @@ class TAO_RTCORBA_Export ProtocolProperties typedef PriorityBandedConnectionPolicy_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj); static PriorityBandedConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PriorityBandedConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static PriorityBandedConnectionPolicy_ptr _nil (void) { return (PriorityBandedConnectionPolicy_ptr)0; } - virtual RTCORBA::PriorityBands * priority_bands ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual ::RTCORBA::PriorityBands * priority_bands ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -2385,7 +2400,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - PriorityBandedConnectionPolicy (); + PriorityBandedConnectionPolicy (void); virtual ~PriorityBandedConnectionPolicy (void); @@ -2489,20 +2504,20 @@ class TAO_RTCORBA_Export ProtocolProperties typedef Current_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static Current_ptr _duplicate (Current_ptr obj); static Current_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Current_ptr _nil (void) { @@ -2510,16 +2525,17 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual RTCORBA::Priority the_priority ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void the_priority ( RTCORBA::Priority the_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -2529,7 +2545,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - Current (); + Current (void); virtual ~Current (void); @@ -2633,20 +2649,20 @@ class TAO_RTCORBA_Export ProtocolProperties typedef Mutex_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static Mutex_ptr _duplicate (Mutex_ptr obj); static Mutex_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Mutex_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static Mutex_ptr _nil (void) { @@ -2654,23 +2670,25 @@ class TAO_RTCORBA_Export ProtocolProperties } virtual void lock ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void unlock ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::Boolean try_lock ( TimeBase::TimeT max_wait - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -2680,7 +2698,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - Mutex (); + Mutex (void); virtual ~Mutex (void); @@ -2784,37 +2802,38 @@ class TAO_RTCORBA_Export ProtocolProperties typedef RTORB_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static int _tao_class_id; + static int _tao_class_id; - // the static operations + // The static operations. static RTORB_ptr _duplicate (RTORB_ptr obj); static RTORB_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static RTORB_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static RTORB_ptr _nil (void) { return (RTORB_ptr)0; } - virtual RTCORBA::Mutex_ptr create_mutex ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual ::RTCORBA::Mutex_ptr create_mutex ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void destroy_mutex ( RTCORBA::Mutex_ptr the_mutex - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -2828,16 +2847,16 @@ class TAO_RTCORBA_Export ProtocolProperties public: MutexNotFound (void); - // Default constructor. - MutexNotFound (const MutexNotFound &); - // Copy constructor. - ~MutexNotFound (void); - // Destructor. MutexNotFound &operator= (const MutexNotFound &); + static MutexNotFound *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2850,42 +2869,38 @@ class TAO_RTCORBA_Export ProtocolProperties ACE_ENV_ARG_DECL_NOT_USED ); - static MutexNotFound *_downcast (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception RTCORBA::RTORB::MutexNotFound. + }; #endif /* end #if !defined */ - virtual RTCORBA::Mutex_ptr create_named_mutex ( + virtual ::RTCORBA::Mutex_ptr create_named_mutex ( const char * name, CORBA::Boolean_out created_flag - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - virtual RTCORBA::Mutex_ptr open_named_mutex ( + virtual ::RTCORBA::Mutex_ptr open_named_mutex ( const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - RTCORBA::RTORB::MutexNotFound + CORBA::SystemException + , RTCORBA::RTORB::MutexNotFound )) = 0; - virtual RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties ( + virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties ( CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size, CORBA::Boolean keep_alive, CORBA::Boolean dont_route, CORBA::Boolean no_delay - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -2899,16 +2914,16 @@ class TAO_RTCORBA_Export ProtocolProperties public: InvalidThreadpool (void); - // Default constructor. - InvalidThreadpool (const InvalidThreadpool &); - // Copy constructor. - ~InvalidThreadpool (void); - // Destructor. InvalidThreadpool &operator= (const InvalidThreadpool &); + static InvalidThreadpool *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode ( @@ -2921,12 +2936,8 @@ class TAO_RTCORBA_Export ProtocolProperties ACE_ENV_ARG_DECL_NOT_USED ); - static InvalidThreadpool *_narrow (CORBA::Exception *); - - // = TAO extension. - static CORBA::Exception *_alloc (void); - }; // Exception RTCORBA::RTORB::InvalidThreadpool. + }; #endif /* end #if !defined */ @@ -2939,8 +2950,8 @@ class TAO_RTCORBA_Export ProtocolProperties CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -2952,65 +2963,66 @@ class TAO_RTCORBA_Export ProtocolProperties CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void destroy_threadpool ( RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( - CORBA::SystemException, - RTCORBA::RTORB::InvalidThreadpool + CORBA::SystemException + , RTCORBA::RTORB::InvalidThreadpool )) = 0; - virtual RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( + virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - virtual RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy ( + virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy ( RTCORBA::ThreadpoolId threadpool - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy ( + virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy ( const RTCORBA::PriorityBands & priority_bands - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy ( + virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy ( const RTCORBA::ProtocolList & protocols - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy ( + virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy ( const RTCORBA::ProtocolList & protocols - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - virtual RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -3020,7 +3032,7 @@ class TAO_RTCORBA_Export ProtocolProperties virtual const char* _interface_repository_id (void) const; protected: - RTORB (); + RTORB (void); virtual ~RTORB (void); diff --git a/TAO/tao/RTCORBA/RTCORBAC.i b/TAO/tao/RTCORBA/RTCORBAC.i index b10c414f145..a7e4e9b58f6 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.i +++ b/TAO/tao/RTCORBA/RTCORBAC.i @@ -77,7 +77,7 @@ RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane_var &p) { ThreadpoolLane *deep_copy = new ThreadpoolLane (*p.ptr_); - + if (deep_copy != 0) { ThreadpoolLane *tmp = deep_copy; @@ -87,7 +87,7 @@ RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane_var &p) } } } - + return *this; } @@ -122,13 +122,13 @@ RTCORBA::ThreadpoolLane_var::operator const ::RTCORBA::ThreadpoolLane &() const } ACE_INLINE -RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() // cast +RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() // cast { return *this->ptr_; } ACE_INLINE -RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() const // cast +RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() const // cast { return *this->ptr_; } @@ -145,7 +145,7 @@ RTCORBA::ThreadpoolLane_var::inout (void) return *this->ptr_; } -// mapping for fixed size +// mapping for fixed size ACE_INLINE ::RTCORBA::ThreadpoolLane & RTCORBA::ThreadpoolLane_var::out (void) { @@ -170,176 +170,176 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CI_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CI_ - // = Static operations. - ACE_INLINE RTCORBA::ThreadpoolLane * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - RTCORBA::ThreadpoolLane *retval = 0; - ACE_NEW_RETURN (retval, RTCORBA::ThreadpoolLane[size], 0); - return retval; - } - - ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (RTCORBA::ThreadpoolLane *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void) // Default constructor. - { - } - - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (maximum)) - { - } +// = Static operations. +ACE_INLINE RTCORBA::ThreadpoolLane * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + RTCORBA::ThreadpoolLane *retval = 0; + ACE_NEW_RETURN (retval, RTCORBA::ThreadpoolLane[size], 0); + return retval; +} - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum, - CORBA::ULong length, - RTCORBA::ThreadpoolLane *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } +ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (RTCORBA::ThreadpoolLane *buffer) +// Free the sequence. +{ + delete [] buffer; +} - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - RTCORBA::ThreadpoolLane *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->maximum_); - RTCORBA::ThreadpoolLane * const tmp2 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_); +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void) // Default constructor. +{ +} - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (maximum)) +{ +} - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum, + CORBA::ULong length, + RTCORBA::ThreadpoolLane *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} - ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs) - // Assignment operator. +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - RTCORBA::ThreadpoolLane *tmp1 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_); + RTCORBA::ThreadpoolLane *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->maximum_); RTCORBA::ThreadpoolLane * const tmp2 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - - return *this; + + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE RTCORBA::ThreadpoolLane & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - RTCORBA::ThreadpoolLane* tmp = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} - ACE_INLINE const RTCORBA::ThreadpoolLane & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i) const - // operator [] +ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; + + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - RTCORBA::ThreadpoolLane * const tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_); + _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + RTCORBA::ThreadpoolLane *tmp1 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_); + RTCORBA::ThreadpoolLane * const tmp2 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} + +// = Accessors. +ACE_INLINE RTCORBA::ThreadpoolLane & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + RTCORBA::ThreadpoolLane* tmp = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_); + return tmp[i]; +} - // Implement the TAO_Base_Sequence methods (see Sequence.h) +ACE_INLINE const RTCORBA::ThreadpoolLane & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + RTCORBA::ThreadpoolLane * const tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} - ACE_INLINE RTCORBA::ThreadpoolLane * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (CORBA::Boolean orphan) +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE RTCORBA::ThreadpoolLane * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (CORBA::Boolean orphan) +{ + RTCORBA::ThreadpoolLane *result = 0; + if (orphan == 0) { - RTCORBA::ThreadpoolLane *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_); } - return result; } - - ACE_INLINE const RTCORBA::ThreadpoolLane * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (void) const + else // if (orphan == 1) { - return ACE_reinterpret_cast(const RTCORBA::ThreadpoolLane * ACE_CAST_CONST, this->buffer_); + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } } + return result; +} - ACE_INLINE void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::replace (CORBA::ULong max, - CORBA::ULong length, - RTCORBA::ThreadpoolLane *data, - CORBA::Boolean release) +ACE_INLINE const RTCORBA::ThreadpoolLane * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (void) const +{ + return ACE_reinterpret_cast(const RTCORBA::ThreadpoolLane * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::replace (CORBA::ULong max, +CORBA::ULong length, +RTCORBA::ThreadpoolLane *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp); - } - this->buffer_ = data; - this->release_ = release; + RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_); + _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp); } + this->buffer_ = data; + this->release_ = release; +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_RTCORBA_THREADPOOLLANES_CI_) #define _RTCORBA_THREADPOOLLANES_CI_ @@ -402,7 +402,7 @@ RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p { ThreadpoolLanes *deep_copy = new ThreadpoolLanes (*p.ptr_); - + if (deep_copy != 0) { ThreadpoolLanes *tmp = deep_copy; @@ -412,7 +412,7 @@ RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p } } } - + return *this; } @@ -440,20 +440,20 @@ RTCORBA::ThreadpoolLanes_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE RTCORBA::ThreadpoolLanes_var::operator const ::RTCORBA::ThreadpoolLanes &() const // cast { return *this->ptr_; } -ACE_INLINE -RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() // cast +ACE_INLINE +RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() // cast { return *this->ptr_; } -ACE_INLINE -RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() const // cast +ACE_INLINE +RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() const // cast { return *this->ptr_; } @@ -482,7 +482,7 @@ RTCORBA::ThreadpoolLanes_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::RTCORBA::ThreadpoolLanes *& RTCORBA::ThreadpoolLanes_var::out (void) { @@ -543,7 +543,7 @@ RTCORBA::ThreadpoolLanes_out::operator= (ThreadpoolLanes *p) return *this; } -ACE_INLINE +ACE_INLINE RTCORBA::ThreadpoolLanes_out::operator ::RTCORBA::ThreadpoolLanes *&() // cast { return this->ptr_; @@ -642,7 +642,7 @@ RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_var &p) { Protocol *deep_copy = new Protocol (*p.ptr_); - + if (deep_copy != 0) { Protocol *tmp = deep_copy; @@ -652,7 +652,7 @@ RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_var &p) } } } - + return *this; } @@ -675,20 +675,20 @@ RTCORBA::Protocol_var::operator const ::RTCORBA::Protocol &() const // cast } ACE_INLINE -RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() // cast +RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() // cast { return *this->ptr_; } ACE_INLINE -RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() const // cast +RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -RTCORBA::Protocol_var::operator ::RTCORBA::Protocol *&() // cast +RTCORBA::Protocol_var::operator ::RTCORBA::Protocol *&() // cast { return this->ptr_; } @@ -705,7 +705,7 @@ RTCORBA::Protocol_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::RTCORBA::Protocol *& RTCORBA::Protocol_var::out (void) { @@ -766,7 +766,7 @@ RTCORBA::Protocol_out::operator= (Protocol *p) return *this; } -ACE_INLINE +ACE_INLINE RTCORBA::Protocol_out::operator ::RTCORBA::Protocol *&() // cast { return this->ptr_; @@ -790,176 +790,176 @@ RTCORBA::Protocol_out::operator-> (void) #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_ - // = Static operations. - ACE_INLINE RTCORBA::Protocol * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - RTCORBA::Protocol *retval = 0; - ACE_NEW_RETURN (retval, RTCORBA::Protocol[size], 0); - return retval; - } - - ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (RTCORBA::Protocol *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Default constructor. - { - } - - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (maximum)) - { - } +// = Static operations. +ACE_INLINE RTCORBA::Protocol * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + RTCORBA::Protocol *retval = 0; + ACE_NEW_RETURN (retval, RTCORBA::Protocol[size], 0); + return retval; +} - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum, - CORBA::ULong length, - RTCORBA::Protocol *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } +ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (RTCORBA::Protocol *buffer) +// Free the sequence. +{ + delete [] buffer; +} - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - 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_); +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Default constructor. +{ +} - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (maximum)) +{ +} - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum, + CORBA::ULong length, + RTCORBA::Protocol *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} - ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs) - // Assignment operator. +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - RTCORBA::Protocol *tmp1 = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_); + 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_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - - return *this; + + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE RTCORBA::Protocol & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - RTCORBA::Protocol* tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} - ACE_INLINE const RTCORBA::Protocol & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) const - // operator [] +ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; + + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - RTCORBA::Protocol * const tmp = ACE_reinterpret_cast (RTCORBA::Protocol* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_); + _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + RTCORBA::Protocol *tmp1 = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_); + RTCORBA::Protocol * const tmp2 = ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} - // Implement the TAO_Base_Sequence methods (see Sequence.h) +// = Accessors. +ACE_INLINE RTCORBA::Protocol & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + RTCORBA::Protocol* tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_); + return tmp[i]; +} + +ACE_INLINE const RTCORBA::Protocol & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + RTCORBA::Protocol * const tmp = ACE_reinterpret_cast (RTCORBA::Protocol* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} - ACE_INLINE RTCORBA::Protocol * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (CORBA::Boolean orphan) +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE RTCORBA::Protocol * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (CORBA::Boolean orphan) +{ + RTCORBA::Protocol *result = 0; + if (orphan == 0) { - RTCORBA::Protocol *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_); } - return result; } - - ACE_INLINE const RTCORBA::Protocol * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (void) const + else // if (orphan == 1) { - return ACE_reinterpret_cast(const RTCORBA::Protocol * ACE_CAST_CONST, this->buffer_); + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } } + return result; +} - ACE_INLINE void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::replace (CORBA::ULong max, - CORBA::ULong length, - RTCORBA::Protocol *data, - CORBA::Boolean release) +ACE_INLINE const RTCORBA::Protocol * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (void) const +{ + return ACE_reinterpret_cast(const RTCORBA::Protocol * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::replace (CORBA::ULong max, +CORBA::ULong length, +RTCORBA::Protocol *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - RTCORBA::Protocol *tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp); - } - this->buffer_ = data; - this->release_ = release; + RTCORBA::Protocol *tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_); + _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp); } + this->buffer_ = data; + this->release_ = release; +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_RTCORBA_PROTOCOLLIST_CI_) #define _RTCORBA_PROTOCOLLIST_CI_ @@ -1015,7 +1015,7 @@ RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p) { ProtocolList *deep_copy = new ProtocolList (*p.ptr_); - + if (deep_copy != 0) { ProtocolList *tmp = deep_copy; @@ -1025,7 +1025,7 @@ RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p) } } } - + return *this; } @@ -1041,27 +1041,27 @@ RTCORBA::ProtocolList_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE RTCORBA::ProtocolList_var::operator const ::RTCORBA::ProtocolList &() const // cast { return *this->ptr_; } -ACE_INLINE -RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() // cast +ACE_INLINE +RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() // cast { return *this->ptr_; } -ACE_INLINE -RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() const // cast +ACE_INLINE +RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList *&() // cast +RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList *&() // cast { return this->ptr_; } @@ -1090,7 +1090,7 @@ RTCORBA::ProtocolList_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::RTCORBA::ProtocolList *& RTCORBA::ProtocolList_var::out (void) { @@ -1151,7 +1151,7 @@ RTCORBA::ProtocolList_out::operator= (ProtocolList *p) return *this; } -ACE_INLINE +ACE_INLINE RTCORBA::ProtocolList_out::operator ::RTCORBA::ProtocolList *&() // cast { return this->ptr_; @@ -1285,7 +1285,7 @@ RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_var &p) { PriorityBand *deep_copy = new PriorityBand (*p.ptr_); - + if (deep_copy != 0) { PriorityBand *tmp = deep_copy; @@ -1295,7 +1295,7 @@ RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_var &p) } } } - + return *this; } @@ -1330,13 +1330,13 @@ RTCORBA::PriorityBand_var::operator const ::RTCORBA::PriorityBand &() const // c } ACE_INLINE -RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() // cast +RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() // cast { return *this->ptr_; } ACE_INLINE -RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() const // cast +RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() const // cast { return *this->ptr_; } @@ -1353,7 +1353,7 @@ RTCORBA::PriorityBand_var::inout (void) return *this->ptr_; } -// mapping for fixed size +// mapping for fixed size ACE_INLINE ::RTCORBA::PriorityBand & RTCORBA::PriorityBand_var::out (void) { @@ -1378,176 +1378,176 @@ RTCORBA::PriorityBand_var::ptr (void) const #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_ - // = Static operations. - ACE_INLINE RTCORBA::PriorityBand * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - RTCORBA::PriorityBand *retval = 0; - ACE_NEW_RETURN (retval, RTCORBA::PriorityBand[size], 0); - return retval; - } - - ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (RTCORBA::PriorityBand *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Default constructor. - { - } - - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (maximum)) - { - } +// = Static operations. +ACE_INLINE RTCORBA::PriorityBand * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (CORBA::ULong size) +// Allocate storage for the sequence. +{ + RTCORBA::PriorityBand *retval = 0; + ACE_NEW_RETURN (retval, RTCORBA::PriorityBand[size], 0); + return retval; +} - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum, - CORBA::ULong length, - RTCORBA::PriorityBand *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } +ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (RTCORBA::PriorityBand *buffer) +// Free the sequence. +{ + delete [] buffer; +} - ACE_INLINE - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - 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_); +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Default constructor. +{ +} - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (maximum)) +{ +} - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum, + CORBA::ULong length, + RTCORBA::PriorityBand *data, + CORBA::Boolean release) +: TAO_Unbounded_Base_Sequence (maximum, length, data, release) +{ +} - ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator= (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs) - // Assignment operator. +ACE_INLINE +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs) +// Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) +{ + if (rhs.buffer_ != 0) { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - RTCORBA::PriorityBand *tmp1 = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_); + 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_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - - return *this; + + this->buffer_ = tmp1; } - - // = Accessors. - ACE_INLINE RTCORBA::PriorityBand & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) - // operator [] + else { - ACE_ASSERT (i < this->maximum_); - RTCORBA::PriorityBand* tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_); - return tmp[i]; + this->buffer_ = 0; } +} - ACE_INLINE const RTCORBA::PriorityBand & - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) const - // operator [] +ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator= (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs) +// Assignment operator. +{ + if (this == &rhs) + return *this; + + if (this->release_) { - ACE_ASSERT (i < this->maximum_); - RTCORBA::PriorityBand * const tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand* ACE_CAST_CONST, this->buffer_); - return tmp[i]; + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_); + _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_); + } } + else + this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + RTCORBA::PriorityBand *tmp1 = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_); + RTCORBA::PriorityBand * const tmp2 = ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; +} - // Implement the TAO_Base_Sequence methods (see Sequence.h) +// = Accessors. +ACE_INLINE RTCORBA::PriorityBand & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + RTCORBA::PriorityBand* tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_); + return tmp[i]; +} - ACE_INLINE RTCORBA::PriorityBand * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (CORBA::Boolean orphan) +ACE_INLINE const RTCORBA::PriorityBand & +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) const +// operator [] +{ + ACE_ASSERT (i < this->maximum_); + RTCORBA::PriorityBand * const tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand* ACE_CAST_CONST, this->buffer_); + return tmp[i]; +} + +// Implement the TAO_Base_Sequence methods (see Sequence.h) + +ACE_INLINE RTCORBA::PriorityBand * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (CORBA::Boolean orphan) +{ + RTCORBA::PriorityBand *result = 0; + if (orphan == 0) { - RTCORBA::PriorityBand *result = 0; - if (orphan == 0) + // We retain ownership. + if (this->buffer_ == 0) { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_); - } + result = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; } - else // if (orphan == 1) + else { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } + result = ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_); } - return result; } - - ACE_INLINE const RTCORBA::PriorityBand * - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (void) const + else // if (orphan == 1) { - return ACE_reinterpret_cast(const RTCORBA::PriorityBand * ACE_CAST_CONST, this->buffer_); + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } } + return result; +} - ACE_INLINE void - RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::replace (CORBA::ULong max, - CORBA::ULong length, - RTCORBA::PriorityBand *data, - CORBA::Boolean release) +ACE_INLINE const RTCORBA::PriorityBand * +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (void) const +{ + return ACE_reinterpret_cast(const RTCORBA::PriorityBand * ACE_CAST_CONST, this->buffer_); +} + +ACE_INLINE void +RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::replace (CORBA::ULong max, +CORBA::ULong length, +RTCORBA::PriorityBand *data, +CORBA::Boolean release) +{ + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_); - _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp); - } - this->buffer_ = data; - this->release_ = release; + RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_); + _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp); } + this->buffer_ = data; + this->release_ = release; +} #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_RTCORBA_PRIORITYBANDS_CI_) #define _RTCORBA_PRIORITYBANDS_CI_ @@ -1610,7 +1610,7 @@ RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p) { PriorityBands *deep_copy = new PriorityBands (*p.ptr_); - + if (deep_copy != 0) { PriorityBands *tmp = deep_copy; @@ -1620,7 +1620,7 @@ RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p) } } } - + return *this; } @@ -1648,20 +1648,20 @@ RTCORBA::PriorityBands_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE RTCORBA::PriorityBands_var::operator const ::RTCORBA::PriorityBands &() const // cast { return *this->ptr_; } -ACE_INLINE -RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() // cast +ACE_INLINE +RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() // cast { return *this->ptr_; } -ACE_INLINE -RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() const // cast +ACE_INLINE +RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() const // cast { return *this->ptr_; } @@ -1690,7 +1690,7 @@ RTCORBA::PriorityBands_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::RTCORBA::PriorityBands *& RTCORBA::PriorityBands_var::out (void) { @@ -1751,7 +1751,7 @@ RTCORBA::PriorityBands_out::operator= (PriorityBands *p) return *this; } -ACE_INLINE +ACE_INLINE RTCORBA::PriorityBands_out::operator ::RTCORBA::PriorityBands *&() // cast { return this->ptr_; @@ -1824,7 +1824,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::Thread return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::ThreadpoolLane &_tao_aggregate) @@ -1837,7 +1837,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::ThreadpoolLan return 1; else return 0; - + } @@ -1865,12 +1865,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (RTCORBA::PriorityModel, _tao_temp); } - + return _tao_result; } @@ -1883,7 +1883,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::Priori return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityBand &_tao_aggregate) @@ -1895,7 +1895,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityBand return 1; else return 0; - + } diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h index 6f3cf0d5c87..efa0f2654f4 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h @@ -18,9 +18,11 @@ #define RT_ENDPOINT_UTILS_H #include "ace/pre.h" -#include "tao/corbafwd.h" #include "rtcorba_export.h" +#include "tao/corbafwd.h" +#include "tao/Policy_ForwardC.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/RTCORBA/diffs/RTCORBAC.h.diff b/TAO/tao/RTCORBA/diffs/RTCORBA.diff index 51644b0fff7..ec70df60930 100644 --- a/TAO/tao/RTCORBA/diffs/RTCORBAC.h.diff +++ b/TAO/tao/RTCORBA/diffs/RTCORBA.diff @@ -1,14 +1,6 @@ ---- orig/RTCORBAC.h Fri Jun 15 10:45:32 2001 -+++ RTCORBAC.h Fri Jun 15 10:31:54 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,15 +23,29 @@ +--- orig/RTCORBAC.h Wed Feb 6 13:37:48 2002 ++++ RTCORBAC.h Wed Feb 6 13:44:01 2002 +@@ -23,15 +23,26 @@ #define _TAO_IDL_ORIG_RTCORBAC_H_ #include "ace/pre.h" @@ -23,10 +15,8 @@ -#include "IOPC.h" -#include "TimeBaseC.h" +#include "tao/IOPC.h" -+#include "tao/PolicyC.h" +#include "tao/TimeBaseC.h" -+#include "tao/Encodable.h" -+//#include "Priority_Mapping_Manager.h" ++#include "tao/PolicyC.h" + +// Forward references. +class TAO_Priority_Mapping_Manager; @@ -37,11 +27,10 @@ +#ifndef TAO_RTCORBA_SAFE_INCLUDE +#error "You should not include RTCORBAC.h directly, use RTCORBA.h" +#endif /* !TAO_RTCORBA_SAFE_INCLUDE */ -+ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO -@@ -58,6 +72,13 @@ +@@ -58,6 +69,15 @@ TAO_NAMESPACE RTCORBA { @@ -50,30 +39,22 @@ + typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr; + typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var; + typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out; ++ ++ typedef TAO_Priority_Mapping PriorityMapping; + // End TAO-specific + typedef CORBA::Short NativePriority; typedef CORBA::Short_out NativePriority_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NativePriority; -@@ -70,6 +91,7 @@ - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short maxPriority; - -+ typedef TAO_Priority_Mapping PriorityMapping; - typedef CORBA::ULong ThreadpoolId; - typedef CORBA::ULong_out ThreadpoolId_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadpoolId; -@@ -673,7 +695,8 @@ - #define _RTCORBA_PROTOCOLPROPERTIES_CH_ + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority; +@@ -674,6 +694,7 @@ class TAO_RTCORBA_Export ProtocolProperties -- : public virtual CORBA_Object -+ : public virtual CORBA_Object, -+ public TAO_Encodable + : public virtual CORBA_Object ++ , public TAO_Encodable { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -@@ -705,6 +728,11 @@ +@@ -705,6 +726,11 @@ virtual const char* _interface_repository_id (void) const; @@ -83,14 +64,38 @@ + virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); + protected: - ProtocolProperties (); + ProtocolProperties (void); -@@ -2930,7 +2958,7 @@ - CORBA::Environment & - ); - -- static InvalidThreadpool *_downcast (CORBA::Exception *); -+ static InvalidThreadpool *_narrow (CORBA::Exception *); +--- orig/RTCORBAC.cpp Wed Feb 6 13:37:48 2002 ++++ RTCORBAC.cpp Wed Feb 6 13:41:48 2002 +@@ -19,7 +19,7 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html +-#include "RTCORBAC.h" ++#include "RTCORBA.h" - // = TAO extension. + #include "tao/Stub.h" + #include "tao/Invocation.h" +@@ -39,6 +39,21 @@ + #include "RTCORBAC.i" + #endif /* !defined INLINE */ + ++////////////////////////////////////////////////////// ++// CDR Encoding Support ++ ++CORBA::Boolean ++RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &) ++{ ++ return 1; ++} ++ ++CORBA::Boolean ++RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) ++{ ++ return 1; ++} ++ + static const CORBA::Long _oc_RTCORBA_NativePriority[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order diff --git a/TAO/tao/RTCORBA/diffs/RTCORBAC.cpp.diff b/TAO/tao/RTCORBA/diffs/RTCORBAC.cpp.diff deleted file mode 100644 index 262d4d60b2c..00000000000 --- a/TAO/tao/RTCORBA/diffs/RTCORBAC.cpp.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- orig/RTCORBAC.cpp Fri Jun 15 10:45:32 2001 -+++ RTCORBAC.cpp Fri Jun 15 10:51:00 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -19,7 +19,9 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - -+#define TAO_RTCORBA_SAFE_INCLUDE - #include "RTCORBAC.h" -+#undef TAO_RTCORBA_SAFE_INCLUDE - - #include "tao/Stub.h" - #include "tao/Invocation.h" -@@ -2640,6 +2642,21 @@ - } - - -+////////////////////////////////////////////////////// -+// CDR Encoding Support -+ -+CORBA::Boolean -+RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &) -+{ -+ return 1; -+} -+ -+CORBA::Boolean -+RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) -+{ -+ return 1; -+} -+ - // default constructor - RTCORBA::TCPProtocolProperties::TCPProtocolProperties () - { -@@ -5224,7 +5241,7 @@ - - // Narrow. - RTCORBA::RTORB::InvalidThreadpool * --RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *exc) -+RTCORBA::RTORB::InvalidThreadpool::_narrow (CORBA::Exception *exc) - { - if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_id ())) - { diff --git a/TAO/tao/RTCORBA/diffs/RTCORBAC.i.diff b/TAO/tao/RTCORBA/diffs/RTCORBAC.i.diff deleted file mode 100644 index 658c4c0ec5f..00000000000 --- a/TAO/tao/RTCORBA/diffs/RTCORBAC.i.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- orig/RTCORBAC.i Fri Jun 15 10:45:32 2001 -+++ RTCORBAC.i Fri Jun 15 09:58:35 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp index c3c50e9300d..b465179d743 100644 --- a/TAO/tao/Service_Context.cpp +++ b/TAO/tao/Service_Context.cpp @@ -1,12 +1,15 @@ -#include "tao/Service_Context.h" - +// +// $Id$ +// -ACE_RCSID(tao, Service_Context, "$Id$") +#include "tao/Service_Context.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) # include "tao/Service_Context.inl" #endif /* ! __ACE_INLINE__ */ +ACE_RCSID(tao, Service_Context, "$Id$") void TAO_Service_Context::set_context_i (IOP::ServiceId id, diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl index 951e67e7ac2..3d2c69a9102 100644 --- a/TAO/tao/StringSeq.pidl +++ b/TAO/tao/StringSeq.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -Ge 1 +// -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 // -Wb,export_macro=TAO_Export // -Wb,export_include="corbafwd.h" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h index 536096b2041..8ca86c7057b 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.h +++ b/TAO/tao/Synch_Reply_Dispatcher.h @@ -22,6 +22,7 @@ #include "tao/Reply_Dispatcher.h" #include "tao/LF_Event.h" #include "tao/GIOP_Message_Version.h" +#include "tao/CDR.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl index 88f795de422..15ac19712ef 100644 --- a/TAO/tao/TAO.pidl +++ b/TAO/tao/TAO.pidl @@ -18,7 +18,8 @@ // 1. Run the tao_idl compiler on the pidl file. The command used for // this is: // -// tao_idl -o orig -Ge 1 +// tao_idl +// -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 // -Wb,export_macro=TAO_Export // -Wb,pre_include="ace/pre.h" // -Wb,post_include="ace/post.h" diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl index 86e3c46efbf..8ac0c7dfb17 100644 --- a/TAO/tao/TimeBase.pidl +++ b/TAO/tao/TimeBase.pidl @@ -11,7 +11,7 @@ * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -Gsp -Gp -Gd -Ge 1 -Gv + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 8d871401477..508f97f2c40 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -35,6 +35,33 @@ CORBA_TypeCode::Bounds::Bounds (void) { } +CORBA_TypeCode::Bounds* +CORBA_TypeCode::Bounds::_downcast (CORBA_Exception *ex) +{ + if (ex->_is_a ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0")) + return ACE_dynamic_cast (CORBA_TypeCode::Bounds*, ex); + return 0; +} + +CORBA::Exception *CORBA_TypeCode::Bounds::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::CORBA_TypeCode::Bounds, 0); + return retval; +} + +CORBA::Exception * +CORBA_TypeCode::Bounds::_tao_duplicate (void) const +{ + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA_TypeCode::Bounds (*this), + 0 + ); + return result; +} + void CORBA_TypeCode::Bounds::_raise (void) { TAO_RAISE(*this); @@ -55,26 +82,31 @@ void CORBA_TypeCode::Bounds::_tao_decode (TAO_InputCDR & { } -CORBA_TypeCode::Bounds* -CORBA_TypeCode::Bounds::_downcast (CORBA_Exception *ex) +// **************************************************************** + +CORBA_TypeCode::BadKind::BadKind (void) + : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0") { - if (ex->_is_a ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0")) - return ACE_dynamic_cast (CORBA_TypeCode::Bounds*, ex); - return 0; } -int -CORBA_TypeCode::Bounds::_is_a (const char* interface_id) const +CORBA_TypeCode::BadKind* +CORBA_TypeCode::BadKind::_downcast (CORBA_Exception *ex) { - return ((ACE_OS::strcmp (interface_id, - "IDL:omg.org/CORBA/TypeCode/Bounds:1.0") - == 0) - || CORBA_UserException::_is_a (interface_id)); + if (ex->_is_a ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0")) + return ACE_dynamic_cast (CORBA_TypeCode::BadKind*, ex); + return 0; } -CORBA_TypeCode::BadKind::BadKind (void) - : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0") +CORBA::Exception * +CORBA_TypeCode::BadKind::_tao_duplicate (void) const { + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA_TypeCode::BadKind (*this), + 0 + ); + return result; } void CORBA_TypeCode::BadKind::_raise (void) @@ -97,24 +129,7 @@ void CORBA_TypeCode::BadKind::_tao_decode (TAO_InputCDR & { } -CORBA_TypeCode::BadKind* -CORBA_TypeCode::BadKind::_downcast (CORBA_Exception *ex) -{ - if (ex->_is_a ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0")) - return ACE_dynamic_cast (CORBA_TypeCode::BadKind*, ex); - return 0; -} - -int -CORBA_TypeCode::BadKind::_is_a (const char* interface_id) const -{ - return ((ACE_OS::strcmp (interface_id, - "IDL:omg.org/CORBA/TypeCode/BadKind:1.0") - == 0) - || CORBA_UserException::_is_a (interface_id)); -} - -// decreases the refcount and deletes when refcount reaches 0 +// **************************************************************** // Constructor for CONSTANT typecodes with empty parameter lists. // These are only created once, and those constants are shared. diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index 63338455486..cbd7d7ebdec 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -68,15 +68,17 @@ public: public: Bounds (void); + static Bounds* _downcast (CORBA_Exception *ex); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode (TAO_OutputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED) const; virtual void _tao_decode (TAO_InputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED); - - static Bounds* _downcast (CORBA_Exception *ex); - virtual int _is_a (const char* interface_id) const; }; class TAO_Export BadKind : public CORBA_UserException @@ -84,15 +86,17 @@ public: public: BadKind (void); + static BadKind* _downcast (CORBA_Exception *ex); + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; + virtual void _raise (void); virtual void _tao_encode (TAO_OutputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED) const; virtual void _tao_decode (TAO_InputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED); - - static BadKind* _downcast (CORBA_Exception *ex); - virtual int _is_a (const char* interface_id) const; }; static CORBA::TypeCode_ptr _tc_Bounds; diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp index e6098693560..0e726865648 100644 --- a/TAO/tao/Typecode_Constants.cpp +++ b/TAO/tao/Typecode_Constants.cpp @@ -169,94 +169,17 @@ TAO_NAMESPACE_BEGIN (CORBA) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ORBid, 0) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Bounds, 0) -TAO_NAMESPACE_END - CORBA::TypeCode_ptr CORBA_ORB::_tc_ObjectId = 0; -CORBA::TypeCode_ptr CORBA_ORB::_tc_InvalidName = 0; #if (TAO_HAS_MINIMUM_CORBA == 0) TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstructionPolicy, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NamedValue, 0) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WrongTransaction, 0) -TAO_NAMESPACE_END #endif /* TAO_HAS_MINIMUM_CORBA */ -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyErrorCode, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyError, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InvalidPolicies, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyType, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Policy, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyList, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyTypeSeq, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SetOverrideType, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyManager, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyCurrent, 0) -TAO_NAMESPACE_END - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DomainManager, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DomainManagerList, 0) -TAO_NAMESPACE_END - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PollableSet, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Pollable, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DIIPollable, 0) -TAO_NAMESPACE_END - // Service definitions TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (CORBA) @@ -281,9 +204,6 @@ TAO_NAMESPACE_END // Internal to TAO ORB CORBA::TypeCode_ptr TC_opaque = 0; -#if 0 -CORBA::TypeCode_ptr TC_ServiceContextList = 0; -#endif /* 0 */ CORBA::TypeCode_ptr TC_completion_status = 0; // Flag that denotes that the TAO TypeCode constants have been @@ -461,31 +381,6 @@ TAO_TypeCodes::init (void) 1, sizeof (CORBA::TypeCode::BadKind)); - static const CORBA::Long _oc_CORBA_ORB_InvalidName[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 38, ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x422f496e), - ACE_NTOHL (0x76616c69), - ACE_NTOHL (0x644e616d), - ACE_NTOHL (0x653a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/ORB/InvalidName:1.0 - 12, ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c69644e), - ACE_NTOHL (0x616d6500), // name = InvalidName - 0, // member count - }; - CORBA::ORB::_tc_InvalidName = - new CORBA::TypeCode(CORBA::tk_except, - sizeof (_oc_CORBA_ORB_InvalidName), - (char *) &_oc_CORBA_ORB_InvalidName, - 0, - sizeof (CORBA::ORB::InvalidName)); - static const CORBA::Long _oc_CORBA_ORBid[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -537,37 +432,6 @@ TAO_TypeCodes::init (void) #if (TAO_HAS_MINIMUM_CORBA == 0) - static const CORBA::Long _oc_CORBA_ConstructionPolicy[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f436f), - ACE_NTOHL (0x6e737472), - ACE_NTOHL (0x75637469), - ACE_NTOHL (0x6f6e506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = - // IDL:omg.org/CORBA/ConstructionPolicy:1.0 - 19, - ACE_NTOHL (0x436f6e73), - ACE_NTOHL (0x74727563), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63790000), // name = ConstructionPolicy, - }; - CORBA::_tc_ConstructionPolicy = - new CORBA::TypeCode (CORBA::tk_objref, - sizeof (_oc_CORBA_ConstructionPolicy), - (char *) &_oc_CORBA_ConstructionPolicy, - 0, - sizeof (CORBA::ConstructionPolicy)); - - static const CORBA::Long _oc_corba_NamedValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -595,36 +459,6 @@ TAO_TypeCodes::init (void) 0, sizeof (CORBA::NamedValue)); - static const CORBA::Long _oc_CORBA_WrongTransaction[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5772), - ACE_NTOHL (0x6f6e6754), - ACE_NTOHL (0x72616e73), - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x6f6e3a31), - ACE_NTOHL (0x2e300000), // repository ID = - // IDL:omg.org/CORBA/WrongTransaction:1.0 - 17, - ACE_NTOHL (0x57726f6e), - ACE_NTOHL (0x67547261), - ACE_NTOHL (0x6e736163), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x0), // name = WrongTransaction - 0, // member count - }; - CORBA::_tc_WrongTransaction = - new CORBA::TypeCode (CORBA::tk_except, - sizeof (_oc_CORBA_WrongTransaction), - (char *) &_oc_CORBA_WrongTransaction, - 0, - sizeof (CORBA::WrongTransaction)); - #endif /* TAO_HAS_MINIMUM_CORBA */ // Service Types @@ -903,526 +737,6 @@ TAO_TypeCodes::init (void) 0, sizeof (CORBA::ServiceInformation)); - // **************************************************************** - - static const CORBA::Long _oc_CORBA_PolicyErrorCode[] = - { - 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, - }; - CORBA::_tc_PolicyErrorCode = - new CORBA::TypeCode (CORBA::tk_alias, - sizeof (_oc_CORBA_PolicyErrorCode), - (char *) &_oc_CORBA_PolicyErrorCode, - 0, - sizeof (CORBA::PolicyErrorCode)); - - 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, - }; - CORBA::_tc_PolicyError = - new CORBA::TypeCode(CORBA::tk_except, - sizeof (_oc_CORBA_PolicyError), - (char *) &_oc_CORBA_PolicyError, - 0, - sizeof (CORBA::PolicyError)); - - 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, - 0, - }; - CORBA::_tc_InvalidPolicies = - new CORBA::TypeCode (CORBA::tk_except, - sizeof (_oc_CORBA_InvalidPolicies), - (char *) &_oc_CORBA_InvalidPolicies, - 0, - sizeof (CORBA::InvalidPolicies)); - - 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, - }; - CORBA::_tc_PolicyType = - new CORBA::TypeCode (CORBA::tk_alias, - sizeof (_oc_CORBA_PolicyType), - (char *) &_oc_CORBA_PolicyType, - 0, - sizeof (CORBA::PolicyType)); - - static const CORBA::Long _oc_CORBA_Policy[] = - { - 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, - }; - CORBA::_tc_Policy = - new CORBA::TypeCode (CORBA::tk_objref, - sizeof (_oc_CORBA_Policy), - (char *) &_oc_CORBA_Policy, - 1, - sizeof (CORBA::Policy)); - - 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, - 0, - }; - CORBA::_tc_PolicyList = - new CORBA::TypeCode (CORBA::tk_alias, - sizeof (_oc_CORBA_PolicyList), - (char *) &_oc_CORBA_PolicyList, - 1, - sizeof (CORBA::PolicyList)); - - 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, - 0, - }; - CORBA::_tc_PolicyTypeSeq = - new CORBA::TypeCode (CORBA::tk_alias, - sizeof (_oc_CORBA_PolicyTypeSeq), - (char *) &_oc_CORBA_PolicyTypeSeq, - 0, - sizeof (CORBA::PolicyTypeSeq)); - - 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 - }; - CORBA::_tc_SetOverrideType = - new CORBA::TypeCode (CORBA::tk_enum, - sizeof (_oc_CORBA_SetOverrideType), - (char *) &_oc_CORBA_SetOverrideType, - 0, - sizeof (CORBA::SetOverrideType)); - - 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, - }; - CORBA::_tc_PolicyManager = - new CORBA::TypeCode (CORBA::tk_objref, - sizeof (_oc_CORBA_PolicyManager), - (char *) &_oc_CORBA_PolicyManager, - 0, - sizeof (CORBA::PolicyManager)); - - 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, - }; - CORBA::_tc_PolicyCurrent = - new CORBA::TypeCode (CORBA::tk_objref, - sizeof (_oc_CORBA_PolicyCurrent), - (char *) &_oc_CORBA_PolicyCurrent, - 0, - sizeof (CORBA::PolicyCurrent)); - - static const CORBA::Long _oc_CORBA_DomainManager[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f446f), - ACE_NTOHL (0x6d61696e), - ACE_NTOHL (0x4d616e61), - ACE_NTOHL (0x6765723a), - ACE_NTOHL (0x312e3000), // repository ID = - //IDL:omg.org/CORBA/DomainManager:1.0 - 14, - ACE_NTOHL (0x446f6d61), - - ACE_NTOHL (0x696e4d61), - ACE_NTOHL (0x6e616765), - ACE_NTOHL (0x72000000), // name = DomainManager, - }; - CORBA::_tc_DomainManager = - new CORBA::TypeCode (CORBA::tk_objref, - sizeof (_oc_CORBA_DomainManager), - (char *) &_oc_CORBA_DomainManager, - 0, - sizeof (CORBA_DomainManager)); - - static const CORBA::Long _oc_CORBA_DomainManagerList[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f446f), - ACE_NTOHL (0x6d61696e), - ACE_NTOHL (0x4d616e61), - ACE_NTOHL (0x6765724c), - ACE_NTOHL (0x6973743a), - ACE_NTOHL (0x312e3000), // repository ID = - //IDL:omg.org/CORBA/DomainManagerList:1.0 - 18, - ACE_NTOHL (0x446f6d61), - ACE_NTOHL (0x696e4d61), - ACE_NTOHL (0x6e616765), - ACE_NTOHL (0x724c6973), - ACE_NTOHL (0x74000000), // name = DomainManagerList - CORBA::tk_sequence, // typecode kind - 80, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_objref, // typecode kind - 64, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f446f), - ACE_NTOHL (0x6d61696e), - ACE_NTOHL (0x4d616e61), - ACE_NTOHL (0x6765723a), - ACE_NTOHL (0x312e3000), // repository ID = - //IDL:omg.org/CORBA/DomainManager:1.0 - 14, - ACE_NTOHL (0x446f6d61), - ACE_NTOHL (0x696e4d61), - ACE_NTOHL (0x6e616765), - ACE_NTOHL (0x72000000), // name = DomainManager, - 0, - }; - CORBA::_tc_DomainManagerList = - new CORBA::TypeCode (CORBA::tk_alias, - sizeof (_oc_CORBA_DomainManagerList), - (char *) &_oc_CORBA_DomainManagerList, - 0, - sizeof (CORBA_DomainManagerList)); - - // **************************************************************** - -#if (TAO_HAS_AMI_POLLER == 1) - static const CORBA::Long _oc_CORBA_Pollable[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c6c6162), - ACE_NTOHL (0x6c653a31), - ACE_NTOHL (0x2e300000), // repository ID = - // IDL:omg.org/CORBA/Pollable:1.0 - 9, - ACE_NTOHL (0x506f6c6c), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x0), // name = Pollable, - }; - CORBA::_tc_Pollable = - new CORBA::TypeCode (CORBA::tk_objref, - sizeof (_oc_CORBA_Pollable), - (char *) &_oc_CORBA_Pollable, - 0, - sizeof (CORBA_Pollable)); - - static const CORBA::Long _oc_CORBA_DIIPollable[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4449), - ACE_NTOHL (0x49506f6c), - ACE_NTOHL (0x6c61626c), - ACE_NTOHL (0x653a312e), - ACE_NTOHL (0x30000000), // repository ID = - // IDL:omg.org/CORBA/DIIPollable:1.0 - 12, - ACE_NTOHL (0x44494950), - ACE_NTOHL (0x6f6c6c61), - ACE_NTOHL (0x626c6500), // name = DIIPollable, - }; - CORBA::_tc_DIIPollable = - new CORBA::TypeCode (CORBA::tk_objref, - sizeof (_oc_CORBA_DIIPollable), - (char *) &_oc_CORBA_DIIPollable, - 0, - sizeof (CORBA::DIIPollable)); - - static const CORBA::Long _oc_CORBA_PollableSet[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c6c6162), - ACE_NTOHL (0x6c655365), - ACE_NTOHL (0x743a312e), - ACE_NTOHL (0x30000000), // repository ID = - // IDL:omg.org/CORBA/PollableSet:1.0 - 12, - ACE_NTOHL (0x506f6c6c), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657400), // name = PollableSet, - }; - CORBA::_tc_PollableSet = - new CORBA::TypeCode (CORBA::tk_objref, - sizeof (_oc_CORBA_PollableSet), - (char *) &_oc_CORBA_PollableSet, - 0, - sizeof (CORBA_PollableSet)); - -#endif /* TAO_HAS_AMI_POLLER == 1 */ - // **************************************************************** static const CORBA::Long _oc_CORBA_Current[] = @@ -1557,30 +871,6 @@ TAO_TypeCodes::init (void) (char *) &oc_completion_status, 1, sizeof (CORBA::CompletionStatus)); - - static const CORBA::Long _oc_CORBA_Bounds[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f426f), - ACE_NTOHL (0x756e6473), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Bounds:1.0 - 7, - ACE_NTOHL (0x426f756e), - ACE_NTOHL (0x64730000), // name = Bounds - 0, // member count - }; - CORBA::_tc_Bounds = - new CORBA::TypeCode (CORBA::tk_except, - sizeof (_oc_CORBA_Bounds), - (char *) &_oc_CORBA_Bounds, - 0, - sizeof (CORBA_Bounds)); } // destroy all the typecodes owned by the ORB @@ -1651,72 +941,26 @@ TAO_TypeCodes::fini (void) CORBA::release (CORBA::TypeCode::_tc_BadKind); // additional typecodes in the CORBA namespace - CORBA::release (CORBA::_tc_Policy); - - CORBA::release (CORBA::_tc_PolicyList); - CORBA::release (CORBA::_tc_Current); - CORBA::release (CORBA::ORB::_tc_InvalidName); - CORBA::release (CORBA::_tc_ORBid); #if (TAO_HAS_MINIMUM_CORBA == 0) - CORBA::release (CORBA::_tc_ConstructionPolicy); - CORBA::release (CORBA::_tc_NamedValue); - CORBA::release (CORBA::_tc_WrongTransaction); - #endif /* TAO_HAS_MINIMUM_CORBA */ CORBA::release (CORBA_ORB::_tc_ObjectId); - CORBA::release (CORBA::_tc_PolicyType); - - CORBA::release (CORBA::_tc_PolicyErrorCode); - - CORBA::release (CORBA::_tc_PolicyError); - - CORBA::release (CORBA::_tc_InvalidPolicies); - - CORBA::release (CORBA::_tc_PolicyTypeSeq); - - CORBA::release (CORBA::_tc_SetOverrideType); - - CORBA::release (CORBA::_tc_PolicyManager); - - CORBA::release (CORBA::_tc_PolicyCurrent); - - CORBA::release (CORBA::_tc_DomainManager); - - CORBA::release (CORBA::_tc_DomainManagerList); - -#if (TAO_HAS_AMI_POLLER == 1) - CORBA::release (CORBA::_tc_Pollable); - - CORBA::release (CORBA::_tc_DIIPollable); - - CORBA::release (CORBA::_tc_PollableSet); -#endif /* (TAO_HAS_AMI_POLLER == 1) */ - // Service types - //= Service type - CORBA::release (CORBA::_tc_ServiceType); - CORBA::release (CORBA::_tc_ServiceOption); - CORBA::release (CORBA::_tc_ServiceDetailType); - CORBA::release (CORBA::_tc_ServiceDetail); - CORBA::release (CORBA::_tc_ServiceInformation); - - CORBA::release (CORBA::_tc_Bounds); - + CORBA::release (CORBA::_tc_ServiceType); + CORBA::release (CORBA::_tc_ServiceOption); + CORBA::release (CORBA::_tc_ServiceDetailType); + CORBA::release (CORBA::_tc_ServiceDetail); + CORBA::release (CORBA::_tc_ServiceInformation); + // TAO specific CORBA::release (TC_opaque); - -#if 0 - CORBA::release (TC_ServiceContextList); -#endif /* 0 */ - CORBA::release (TC_completion_status); } diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl new file mode 100644 index 00000000000..0c6f36a6a26 --- /dev/null +++ b/TAO/tao/WrongTransaction.pidl @@ -0,0 +1,46 @@ +/** + * @file WrongTransaction.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the CORBA::WrongTransaction + * exception. + * + * This file is used to generate WrongTransactionC.*, using the + * following command: + * + * tao_idl + * -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * WrongTransaction.pidl + * + * and then: + * + * patch < diffs/WrongTransaction.diff + * + */ +#ifndef TAO_CORBA_WRONGTRANSACTION_PIDL +#define TAO_CORBA_WRONGTRANSACTION_PIDL + +#pragma prefix "omg.org" + +module CORBA +{ + /** + * @exception WrongTransaction + * + * @brief UserException for DII requests. + * + * This exception is thrown if a CORBA Request is implicitly + * associated with a transaction and is found to have an + * error in its parameters when checked at runtime (invocation). + */ + exception WrongTransaction {}; +}; + +#pragma prefix "" + +#endif /* TAO_CORBA_WRONGTRANSACTION_PIDL */ diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 7104b6dcef8..5ee54b41718 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -1,100 +1,271 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/WrongTransactionC.h" -#include "tao/Environment.h" -#include "tao/CDR.h" +#include "WrongTransactionC.h" #if (TAO_HAS_MINIMUM_CORBA == 0) -// default constructor -CORBA_WrongTransaction::CORBA_WrongTransaction (void) +#include "tao/Stub.h" +#include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#include "tao/ClientRequestInfo_i.h" +#include "tao/ClientInterceptorAdapter.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "WrongTransactionC.i" +#endif /* !defined INLINE */ + +// Default constructor. +CORBA::WrongTransaction::WrongTransaction (void) : CORBA_UserException ("IDL:omg.org/CORBA/WrongTransaction:1.0") { } -// destructor - all members are of self managing types -CORBA_WrongTransaction::~CORBA_WrongTransaction (void) +// Destructor - all members are of self managing types. +CORBA::WrongTransaction::~WrongTransaction (void) { } -// copy constructor -CORBA_WrongTransaction::CORBA_WrongTransaction (const CORBA_WrongTransaction &_tao_excp) +// Copy constructor. +CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao_excp) : CORBA_UserException (_tao_excp._id ()) { } -// assignment operator -CORBA_WrongTransaction& -CORBA_WrongTransaction::operator= (const CORBA_WrongTransaction &_tao_excp) +// Assignment operator. +CORBA::WrongTransaction& +CORBA::WrongTransaction::operator= (const ::CORBA::WrongTransaction &_tao_excp) { - this->CORBA_UserException::operator= (_tao_excp); return *this; } -// narrow -CORBA_WrongTransaction_ptr -CORBA_WrongTransaction::_downcast (CORBA::Exception *exc) +void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer) +{ + WrongTransaction *tmp = ACE_static_cast (WrongTransaction*, _tao_void_pointer); + delete tmp; +} + +CORBA::WrongTransaction * +CORBA::WrongTransaction::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CORBA_WrongTransaction_ptr, exc); + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_id ())) + { + return ACE_dynamic_cast (WrongTransaction *, exc); + } else - return 0; + { + return 0; + } } +CORBA::Exception *CORBA::WrongTransaction::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::CORBA::WrongTransaction, 0); + return retval; +} -void CORBA_WrongTransaction::_raise (void) +CORBA::Exception * +CORBA::WrongTransaction::_tao_duplicate (void) const { - TAO_RAISE(*this); + CORBA::Exception *result; + ACE_NEW_RETURN ( + result, + CORBA::WrongTransaction (*this), + 0 + ); + return result; } -void CORBA_WrongTransaction::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const +void CORBA::WrongTransaction::_raise () +{ + TAO_RAISE (*this); +} + +void CORBA::WrongTransaction::_tao_encode ( + TAO_OutputCDR &cdr + ACE_ENV_ARG_DECL + ) const { if (cdr << *this) - return; + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } -void CORBA_WrongTransaction::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) +void CORBA::WrongTransaction::_tao_decode ( + TAO_InputCDR &cdr + ACE_ENV_ARG_DECL + ) { if (cdr >> *this) - return; + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } -CORBA::Exception *CORBA_WrongTransaction::_alloc (void) +static const CORBA::Long _oc_CORBA_WrongTransaction[] = { - CORBA::Exception *retval = 0; + TAO_ENCAP_BYTE_ORDER, // byte order + 39, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5772), + ACE_NTOHL (0x6f6e6754), + ACE_NTOHL (0x72616e73), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0 + 17, + ACE_NTOHL (0x57726f6e), + ACE_NTOHL (0x67547261), + ACE_NTOHL (0x6e736163), + ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x0), // name = WrongTransaction + 0, // member count +}; - ACE_NEW_RETURN (retval, - CORBA_WrongTransaction, - 0); +static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction ( + CORBA::tk_except, + sizeof (_oc_CORBA_WrongTransaction), + (char *) &_oc_CORBA_WrongTransaction, + 0, + sizeof (CORBA::WrongTransaction) + ); - return retval; +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (CORBA) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_WrongTransaction, &_tc_TAO_tc_CORBA_WrongTransaction) +TAO_NAMESPACE_END + + +// TAO extension - the virtual _type method. +CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const +{ + return ::CORBA::_tc_WrongTransaction; } -CORBA::Boolean -operator<< (TAO_OutputCDR &cdr, const CORBA_WrongTransaction &wt) +void operator<<= (CORBA::Any &_tao_any, const CORBA::WrongTransaction &_tao_elem) // copying { - if (cdr << wt._id ()) - return 1; - return 0; + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + CORBA::_tc_WrongTransaction, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } -CORBA::Boolean -operator>> (TAO_InputCDR &, CORBA_WrongTransaction &) +void operator<<= (CORBA::Any &_tao_any, CORBA::WrongTransaction *_tao_elem) // non copying { - return 1; + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + CORBA::_tc_WrongTransaction, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + CORBA::WrongTransaction::_tao_any_destructor + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WrongTransaction *&_tao_elem) +{ + return _tao_any >>= ACE_const_cast( + const CORBA::WrongTransaction*&, + _tao_elem + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::WrongTransaction *&_tao_elem) +{ + _tao_elem = 0; + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); + + CORBA::Boolean result = type->equivalent (CORBA::_tc_WrongTransaction ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + + if (_tao_any.any_owns_data ()) + { + _tao_elem = (CORBA::WrongTransaction *)_tao_any.value (); + return 1; + } + else + { + CORBA::WrongTransaction *tmp; + ACE_NEW_RETURN (tmp, CORBA::WrongTransaction, 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/WrongTransaction:1.0")) + return 0; + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( + CORBA::_tc_WrongTransaction, + 1, + tmp, + CORBA::WrongTransaction::_tao_any_destructor + ); + _tao_elem = tmp; + return 1; + } + else + { + delete tmp; + } + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; } -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index 9dff05c5b16..a29869dc5f8 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -1,42 +1,53 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file WrongTransactionC.h - * - * $Id$ - * - * ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* - * TAO and the TAO IDL Compiler have been developed by the Center for - * Distributed Object Computing at Washington University, St. Louis. - * - * Information about TAO is available at: - * http://www.cs.wustl.edu/~schmidt/TAO.html - * - */ -//============================================================================= - - -#ifndef TAO_IDL_WRONG_TRANSACTIONC_H -#define TAO_IDL_WRONG_TRANSACTIONC_H -#include "ace/pre.h" +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_ +#define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_ -#include "tao/orbconf.h" +#include "ace/pre.h" +#include "tao/corbafwd.h" #if (TAO_HAS_MINIMUM_CORBA == 0) -#include "tao/corbafwd.h" #include "tao/Exception.h" +#include "tao/CDR.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "TAO_Export.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO +#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) @@ -44,49 +55,85 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -/** - * @class CORBA_WrongTransaction - * - * @brief Exception class generated by the TAO IDL compiler. - * - * This exception is thrown if a CORBA Request is implicitly - * associated with a transaction and is found to have an - * error in its parameters when checked at runtime (invocation). - */ -class TAO_Export CORBA_WrongTransaction : public CORBA::UserException +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +TAO_NAMESPACE CORBA { -public: - CORBA_WrongTransaction (void); // default ctor - CORBA_WrongTransaction (const CORBA_WrongTransaction &); // copy ctor - ~CORBA_WrongTransaction (void); // dtor - CORBA_WrongTransaction &operator= (const CORBA_WrongTransaction &); +#if !defined (_CORBA_WRONGTRANSACTION_CH_) +#define _CORBA_WRONGTRANSACTION_CH_ + + class TAO_Export WrongTransaction : public CORBA::UserException + { + public: + + WrongTransaction (void); + WrongTransaction (const WrongTransaction &); + ~WrongTransaction (void); + + WrongTransaction &operator= (const WrongTransaction &); + + static void _tao_any_destructor (void*); + + static WrongTransaction *_downcast (CORBA::Exception *); + static CORBA::Exception *_alloc (void); + virtual CORBA::Exception *_tao_duplicate (void) const; - virtual void _raise (void); + virtual void _raise (void); - virtual void _tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL_NOT_USED) const; - virtual void _tao_decode (TAO_InputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED); + virtual void _tao_encode ( + TAO_OutputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ) const; - static CORBA_WrongTransaction *_downcast (CORBA::Exception *); + virtual void _tao_decode ( + TAO_InputCDR & + ACE_ENV_ARG_DECL_NOT_USED + ); - // = TAO extension - static CORBA::Exception *_alloc (void); + virtual CORBA::TypeCode_ptr _type (void) const; + }; -}; // exception CORBA::WrongTransaction +TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WrongTransaction; -TAO_Export CORBA::Boolean -operator<< (TAO_OutputCDR &, const CORBA_WrongTransaction &); -TAO_Export CORBA::Boolean -operator>> (TAO_InputCDR &, CORBA_WrongTransaction &); + +#endif /* end #if !defined */ + + +} +TAO_NAMESPACE_CLOSE // module CORBA + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&); + +#ifndef __ACE_INLINE__ + +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransaction &); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &); + + +#endif /* __ACE_INLINE__ */ + + +#if defined (__ACE_INLINE__) +#include "WrongTransactionC.i" +#endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_MINIMUM_CORBA */ +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #include "ace/post.h" -#endif /* ifndef TAO_IDL_WRONG_TRANSACTIONC_H */ +#endif /* ifndef */ diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index a7dc6bca2f3..6f6a18da852 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -37,12 +37,6 @@ #include "tao/varbase.h" #include "tao/TAO_Export.h" -// @@ NW: Disable messing with the alignment for now. -// For some reason, PC compilers don't implement "natural" alignment, -// but only use fixed alignment policies. The following #pragmas -// configure fixed one-byte alignment policy, since some fixed policy -// needs to apply throughout an ORB. - #if defined (_MSC_VER) || defined (__BORLANDC__) # ifdef _DEBUG /* convert from VC++ convention ... */ # define TAO_DEBUG /* ... to normal convention */ @@ -151,9 +145,6 @@ TAO_SYSTEM_EXCEPTION_LIST #if (TAO_HAS_MINIMUM_CORBA == 0) -class CORBA_WrongTransaction; -typedef CORBA_WrongTransaction *CORBA_WrongTransaction_ptr; - class CORBA_ConstructionPolicy; class CORBA_ConstructionPolicy_var; class CORBA_ConstructionPolicy_out; @@ -251,60 +242,6 @@ class CORBA_WString_out; class CORBA_ExceptionList; -class CORBA_PolicyError; -typedef CORBA_PolicyError *CORBA_PolicyError_ptr; - -class CORBA_InvalidPolicies; -typedef CORBA_InvalidPolicies* CORBA_InvalidPolicies_ptr; - -class CORBA_PolicyTypeSeq; -class CORBA_PolicyTypeSeq_var; -class CORBA_PolicyTypeSeq_out; - -class CORBA_PolicyManager; -class CORBA_PolicyManager_var; -class CORBA_PolicyManager_out; -typedef CORBA_PolicyManager *CORBA_PolicyManager_ptr; - -class CORBA_PolicyCurrent; -class CORBA_PolicyCurrent_var; -class CORBA_PolicyCurrent_out; -typedef CORBA_PolicyCurrent *CORBA_PolicyCurrent_ptr; - -class CORBA_Policy; -class CORBA_Policy_var; -class CORBA_Policy_out; -typedef CORBA_Policy *CORBA_Policy_ptr; - -class CORBA_PolicyList; -class CORBA_PolicyList_var; -class CORBA_PolicyList_out; - -class CORBA_DomainManager; -class CORBA_DomainManager_var; -class CORBA_DomainManager_out; -typedef CORBA_DomainManager *CORBA_DomainManager_ptr; - -class CORBA_DomainManagerList; -class CORBA_DomainManagerList_var; -class CORBA_DomainManagerList_out; -typedef CORBA_DomainManagerList *CORBA_DomainManagerList_ptr; - -class CORBA_PollableSet; -class CORBA_PollableSet_var; -class CORBA_PollableSet_out; -typedef CORBA_PollableSet *CORBA_PollableSet_ptr; - -class CORBA_Pollable; -class CORBA_Pollable_var; -class CORBA_Pollable_out; -typedef CORBA_Pollable *CORBA_Pollable_ptr; - -class CORBA_DIIPollable; -class CORBA_DIIPollable_var; -class CORBA_DIIPollable_out; -typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr; - /** * @class TAO_OutputCDR; @@ TODO This should be TAO_TAO_Stub @@ -600,9 +537,6 @@ class CORBA_OctetSeq; class CORBA_OctetSeq_var; class CORBA_OctetSeq_out; -class CORBA_Bounds; -typedef CORBA_Bounds *CORBA_Bounds_ptr; - // enum values defined in tao/NVList.h, bitwise ORed. typedef u_int CORBA_Flags; @@ -811,8 +745,6 @@ TAO_NAMESPACE CORBA typedef CORBA_TypeCodeFactory_var TypeCodeFactory_var; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeCodeFactory; - typedef CORBA_Bounds Bounds; - typedef CORBA_Bounds *Bounds_ptr; #ifdef TAO_HAS_VALUETYPE typedef CORBA_ValueBase ValueBase; typedef CORBA_ValueBase *ValueBase_ptr; @@ -969,7 +901,6 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_UnknownUserException; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Bounds; TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Current; TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_NamedValue; @@ -999,41 +930,6 @@ TAO_NAMESPACE CORBA typedef CORBA::String_out ORBid_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ORBid; - - - typedef CORBA::Short PolicyErrorCode; - typedef CORBA::Short_out PolicyErrorCode_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyErrorCode; - - TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode BAD_POLICY; - TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode UNSUPPORTED_POLICY; - TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode BAD_POLICY_TYPE; - TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode BAD_POLICY_VALUE; - TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode UNSUPPORTED_POLICY_VALUE; - - typedef CORBA_PolicyError PolicyError; - typedef CORBA_PolicyError *PolicyError_ptr; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyError; - - typedef CORBA_InvalidPolicies InvalidPolicies; - typedef CORBA_InvalidPolicies* InvalidPolicies_ptr; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InvalidPolicies; - - typedef CORBA::ULong PolicyType; - typedef CORBA::ULong_out PolicyType_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyType; - - typedef CORBA_Policy Policy; - typedef CORBA_Policy *Policy_ptr; - typedef CORBA_Policy_var Policy_var; - typedef CORBA_Policy_out Policy_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Policy; - - typedef CORBA_PolicyList PolicyList; - typedef CORBA_PolicyList_var PolicyList_var; - typedef CORBA_PolicyList_out PolicyList_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyList; - // = Service definitions typedef CORBA::UShort ServiceType; typedef ServiceType CORBA_ServiceType; @@ -1066,78 +962,8 @@ TAO_NAMESPACE CORBA typedef CORBA_ServiceInformation *ServiceInformation_ptr; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceInformation; - typedef CORBA_PolicyTypeSeq PolicyTypeSeq; - typedef CORBA_PolicyTypeSeq_var PolicyTypeSeq_var; - typedef CORBA_PolicyTypeSeq_out PolicyTypeSeq_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyTypeSeq; - - enum SetOverrideType - { - SET_OVERRIDE, - ADD_OVERRIDE - }; - typedef SetOverrideType &SetOverrideType_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SetOverrideType; - - typedef CORBA_PolicyManager PolicyManager; - typedef CORBA_PolicyManager_var PolicyManager_var; - typedef CORBA_PolicyManager_out PolicyManager_out; - typedef CORBA_PolicyManager *PolicyManager_ptr; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyManager; - - typedef CORBA_PolicyCurrent PolicyCurrent; - typedef CORBA_PolicyCurrent_var PolicyCurrent_var; - typedef CORBA_PolicyCurrent_out PolicyCurrent_out; - typedef CORBA_PolicyCurrent *PolicyCurrent_ptr; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyCurrent; - - typedef CORBA_DomainManager DomainManager; - typedef CORBA_DomainManager *DomainManager_ptr; - typedef CORBA_DomainManager_var DomainManager_var; - typedef CORBA_DomainManager_out DomainManager_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DomainManager; - - typedef CORBA_DomainManagerList DomainManagerList; - typedef CORBA_DomainManagerList *DomainManagerList_ptr; - typedef CORBA_DomainManagerList_var DomainManagerList_var; - typedef CORBA_DomainManagerList_out DomainManagerList_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DomainManagerList; - - TAO_NAMESPACE_STORAGE_CLASS const PolicyType SecConstruction; - -#if (TAO_HAS_MINIMUM_CORBA == 0) - typedef CORBA_ConstructionPolicy ConstructionPolicy; - typedef CORBA_ConstructionPolicy *ConstructionPolicy_ptr; - typedef CORBA_ConstructionPolicy_var ConstructionPolicy_var; - typedef CORBA_ConstructionPolicy_out ConstructionPolicy_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstructionPolicy; - - typedef CORBA_WrongTransaction WrongTransaction; - typedef WrongTransaction *WrongTransaction_ptr; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WrongTransaction; - -#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */ - // **************************************************************** - typedef CORBA_PollableSet PollableSet; - typedef CORBA_PollableSet_var PollableSet_var; - typedef CORBA_PollableSet_out PollableSet_out; - typedef CORBA_PollableSet_ptr PollableSet_ptr; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PollableSet; - - typedef CORBA_Pollable Pollable; - typedef CORBA_Pollable_var Pollable_var; - typedef CORBA_Pollable_out Pollable_out; - typedef CORBA_Pollable_ptr Pollable_ptr; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Pollable; - - typedef CORBA_DIIPollable DIIPollable; - typedef CORBA_DIIPollable_var DIIPollable_var; - typedef CORBA_DIIPollable_out DIIPollable_out; - typedef CORBA_DIIPollable_ptr DIIPollable_ptr; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DIIPollable; - // =================== Interface Repository ===================== typedef char *RepositoryId; typedef CORBA::String_var RepositoryId_var; diff --git a/TAO/tao/diffs/Bounds.diff b/TAO/tao/diffs/Bounds.diff new file mode 100644 index 00000000000..8fdbc54f911 --- /dev/null +++ b/TAO/tao/diffs/Bounds.diff @@ -0,0 +1,18 @@ +--- orig/BoundsC.h Tue Feb 5 14:02:29 2002 ++++ BoundsC.h Tue Feb 5 14:04:26 2002 +@@ -23,13 +23,14 @@ + #define _TAO_IDL_ORIG_BOUNDSC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + + #include "TAO_Export.h" ++#include "Exception.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/diffs/Current.pidl.diff b/TAO/tao/diffs/Current.pidl.diff deleted file mode 100644 index 1daf53db792..00000000000 --- a/TAO/tao/diffs/Current.pidl.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- Current.pidl Mon Aug 20 22:55:38 2001 -+++ orig/Current.pidl Fri Apr 13 22:44:21 2001 -@@ -58,9 +58,6 @@ - - #pragma prefix "omg.org" - --module CORBA --{ -- local interface Current {}; --}; -+local interface CORBA_Current {}; - - #pragma prefix "" diff --git a/TAO/tao/diffs/Domain.diff b/TAO/tao/diffs/Domain.diff new file mode 100644 index 00000000000..514400a489c --- /dev/null +++ b/TAO/tao/diffs/Domain.diff @@ -0,0 +1,61 @@ +--- orig/DomainC.h Mon Feb 4 17:27:57 2002 ++++ DomainC.h Mon Feb 4 17:28:11 2002 +@@ -31,7 +31,7 @@ + + #include "TAO_Export.h" + #include "PolicyC.h" +-#include "InterfaceDefC.h" ++#include "Sequence.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +--- orig/DomainC.cpp Mon Feb 4 17:27:57 2002 ++++ DomainC.cpp Tue Feb 5 13:46:30 2002 +@@ -31,6 +31,9 @@ + #include "tao/ClientInterceptorAdapter.h" + #endif /* TAO_HAS_INTERCEPTORS == 1 */ + ++#include "tao/IFR_Client_Adapter.h" ++#include "ace/Dynamic_Service.h" ++ + #if defined (__BORLANDC__) + #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig + #endif /* __BORLANDC__ */ +@@ -1099,7 +1102,15 @@ + parameter_list->length (2); + CORBA::ULong len = 0; + +- (*parameter_list)[len].argument <<= this->object_type_; ++ TAO_IFR_Client_Adapter *adapter = ++ ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( ++ TAO_ORB_Core::ifr_client_adapter_name () ++ ); ++ ++ adapter->interfacedef_any_insert ( ++ (*parameter_list)[len].argument, ++ this->object_type_ ++ ); + (*parameter_list)[len].mode = CORBA::PARAM_IN; + len++; + (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_); +@@ -1186,6 +1197,11 @@ + + #endif /* TAO_HAS_INTERCEPTORS */ + ++ TAO_IFR_Client_Adapter *adapter = ++ ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( ++ TAO_ORB_Core::ifr_client_adapter_name () ++ ); ++ + for (;;) + { + _invoke_status = TAO_INVOKE_EXCEPTION; +@@ -1234,7 +1250,7 @@ + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( +- (_tao_out << object_type) && ++ (adapter->interfacedef_cdr_insert (_tao_out, object_type)) && + (_tao_out << CORBA::Any::from_boolean (constr_policy)) + )) + TAO_INTERCEPTOR_THROW ( diff --git a/TAO/tao/diffs/Domain.pidl.diff b/TAO/tao/diffs/Domain.pidl.diff deleted file mode 100644 index 564131de371..00000000000 --- a/TAO/tao/diffs/Domain.pidl.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- Domain.pidl Fri Apr 13 23:29:22 2001 -+++ orig/Domain.pidl Fri Apr 13 23:27:34 2001 -@@ -75,18 +75,19 @@ - - module CORBA - { -- interface InterfaceDef; -+ const PolicyType SecConstruction = 11; -+}; -+ -+interface CORBA_InterfaceDef; - -- interface DomainManager -+interface CORBA_DomainManager - { -- Policy get_domain_policy ( -- in PolicyType policy_type -+ CORBA_Policy get_domain_policy ( -+ in CORBA_PolicyType policy_type - ); - }; - -- const PolicyType SecConstruction = 11; -- -- interface ConstructionPolicy : Policy -+interface CORBA_ConstructionPolicy : CORBA_Policy - { - void make_domain_manager ( - in InterfaceDef object_type, -@@ -94,8 +95,7 @@ - ); - }; - -- typedef sequence <DomainManager> DomainManagerList; --}; -+typedef sequence <CORBA_DomainManager> CORBA_DomainManagerList; - - #pragma prefix "" - diff --git a/TAO/tao/diffs/DomainC.cpp.diff b/TAO/tao/diffs/DomainC.cpp.diff deleted file mode 100644 index 2b140bc66b0..00000000000 --- a/TAO/tao/diffs/DomainC.cpp.diff +++ /dev/null @@ -1,335 +0,0 @@ ---- orig/DomainC.cpp Tue Apr 24 23:48:52 2001 -+++ DomainC.cpp Tue Apr 24 13:44:40 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -27,6 +27,8 @@ - #if TAO_HAS_INTERCEPTORS == 1 - #include "tao/RequestInfo_Util.h" - #endif /* TAO_HAS_INTERCEPTORS == 1 */ -+#include "tao/IFR_Client_Adapter.h" -+#include "ace/Dynamic_Service.h" - - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus -@@ -36,52 +38,6 @@ - #include "DomainC.i" - #endif /* !defined INLINE */ - --TAO_NAMESPACE_TYPE (const CORBA::ULong) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (const CORBA::ULong, SecConstruction, 11U) --TAO_NAMESPACE_END --CORBA_DomainManager_ptr --tao_CORBA_DomainManager_duplicate ( -- CORBA_DomainManager_ptr p -- ) --{ -- return CORBA_DomainManager::_duplicate (p); --} -- --void --tao_CORBA_DomainManager_release ( -- CORBA_DomainManager_ptr p -- ) --{ -- CORBA::release (p); --} -- --CORBA_DomainManager_ptr --tao_CORBA_DomainManager_nil ( -- void -- ) --{ -- return CORBA_DomainManager::_nil (); --} -- --CORBA_DomainManager_ptr --tao_CORBA_DomainManager_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return CORBA_DomainManager::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_CORBA_DomainManager_upcast ( -- void *src -- ) --{ -- CORBA_DomainManager **tmp = -- ACE_static_cast (CORBA_DomainManager **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class CORBA_DomainManager_var -@@ -205,9 +161,8 @@ - ACE_static_cast (CORBA_DomainManager **, src); - return *tmp; - } -- - // ************************************************************* --// Inline operations for class CORBA_DomainManager_out -+// Operations for class CORBA_DomainManager_out - // ************************************************************* - - CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_ptr &p) -@@ -296,14 +251,14 @@ - ) - ACE_THROW_SPEC ((CORBA::SystemException)); - -- void result (CORBA_Policy_ptr result); -+ void result (CORBA::Policy_ptr result); - - private: - TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &); - void operator= (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &); - - const CORBA::PolicyType & policy_type_; -- CORBA_Policy_ptr _result; -+ CORBA::Policy_ptr _result; - }; - - TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy ( -@@ -365,7 +320,7 @@ - } - - void --TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA_Policy_ptr result) -+TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Policy_ptr result) - { - // update the result - this->_result = result; -@@ -385,7 +340,7 @@ - - // Remote Implementation of the IDL interface methods - --CORBA_Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ( -+CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy ( - CORBA_Object *_collocated_tao_target_, - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV -@@ -395,8 +350,8 @@ - )) - { - -- CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil (); -- CORBA_Policy_var _tao_safe_retval (_tao_retval); -+ CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil (); -+ CORBA::Policy_var _tao_safe_retval (_tao_retval); - - - TAO_Stub *istub = _collocated_tao_target_->_stubobj (); -@@ -491,7 +446,7 @@ - } - - TAO_INTERCEPTOR ( -- CORBA_Policy_ptr _tao_retval_info = _tao_safe_retval._retn (); -+ CORBA::Policy_ptr _tao_retval_info = _tao_safe_retval._retn (); - ri.result (_tao_retval_info); - _tao_safe_retval = _tao_retval_info; - ); -@@ -742,7 +697,7 @@ - return "IDL:CORBA_DomainManager:1.0"; - } - --CORBA_Policy_ptr CORBA_DomainManager::get_domain_policy ( -+CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy ( - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -791,49 +746,6 @@ - CORBA::TypeCode_ptr _tc_CORBA_DomainManager = - &_tc_TAO_tc_CORBA_DomainManager; - --CORBA_ConstructionPolicy_ptr --tao_CORBA_ConstructionPolicy_duplicate ( -- CORBA_ConstructionPolicy_ptr p -- ) --{ -- return CORBA_ConstructionPolicy::_duplicate (p); --} -- --void --tao_CORBA_ConstructionPolicy_release ( -- CORBA_ConstructionPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --CORBA_ConstructionPolicy_ptr --tao_CORBA_ConstructionPolicy_nil ( -- void -- ) --{ -- return CORBA_ConstructionPolicy::_nil (); --} -- --CORBA_ConstructionPolicy_ptr --tao_CORBA_ConstructionPolicy_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return CORBA_ConstructionPolicy::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_CORBA_ConstructionPolicy_upcast ( -- void *src -- ) --{ -- CORBA_ConstructionPolicy **tmp = -- ACE_static_cast (CORBA_ConstructionPolicy **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class CORBA_ConstructionPolicy_var - // ************************************************************* -@@ -956,9 +868,8 @@ - ACE_static_cast (CORBA_ConstructionPolicy **, src); - return *tmp; - } -- - // ************************************************************* --// Inline operations for class CORBA_ConstructionPolicy_out -+// Operations for class CORBA_ConstructionPolicy_out - // ************************************************************* - - CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &p) -@@ -1024,7 +935,7 @@ - TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -1052,7 +963,7 @@ - TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &); - void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &); - -- CORBA_InterfaceDef_ptr object_type_; -+ CORBA::InterfaceDef_ptr object_type_; - const CORBA::Boolean & constr_policy_; - - }; -@@ -1060,7 +971,7 @@ - TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy, - CORBA::Environment & - ) -@@ -1080,9 +991,17 @@ - - Dynamic::ParameterList_var safe_parameter_list = parameter_list; - -+ TAO_IFR_Client_Adapter *adapter = -+ ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( -+ TAO_ORB_Core::ifr_client_adapter_name () -+ ); -+ - CORBA::ULong length_object_type = parameter_list->length (); - parameter_list->length (length_object_type + 1); -- (*parameter_list)[length_object_type].argument <<= this->object_type_; -+ adapter->interfacedef_any_insert ( -+ (*parameter_list)[length_object_type].argument, -+ this->object_type_ -+ ); - - (*parameter_list)[length_object_type].mode = Dynamic::PARAM_IN; - -@@ -1136,7 +1055,7 @@ - - void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( - CORBA_Object *_collocated_tao_target_, -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -1168,6 +1087,11 @@ - - #endif /* TAO_HAS_INTERCEPTORS */ - -+ TAO_IFR_Client_Adapter *adapter = -+ ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( -+ TAO_ORB_Core::ifr_client_adapter_name () -+ ); -+ - for (;;) - { - int _invoke_status = TAO_INVOKE_EXCEPTION; -@@ -1208,7 +1132,7 @@ - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( -- (_tao_out << object_type) && -+ (adapter->interfacedef_cdr_insert (_tao_out, object_type)) && - (_tao_out << CORBA::Any::from_boolean (constr_policy)) - )) - TAO_INTERCEPTOR_THROW ( -@@ -1449,7 +1373,7 @@ - { - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:CORBA_ConstructionPolicy:1.0")) || -- (!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 -@@ -1465,13 +1389,13 @@ - retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast - (ptr_arith_t, -- &CORBA_Policy::_narrow)) -+ &::CORBA::Policy::_narrow)) - retv = ACE_reinterpret_cast - ( - void *, - ACE_static_cast - ( -- CORBA_Policy_ptr, -+ CORBA::Policy_ptr, - this - ) - ); -@@ -1490,7 +1414,7 @@ - } - - void CORBA_ConstructionPolicy::make_domain_manager ( -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -2056,11 +1980,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -2071,4 +1990,3 @@ - } - return 0; // error - } -- diff --git a/TAO/tao/diffs/DomainC.h.diff b/TAO/tao/diffs/DomainC.h.diff deleted file mode 100644 index 0e24fec125c..00000000000 --- a/TAO/tao/diffs/DomainC.h.diff +++ /dev/null @@ -1,227 +0,0 @@ ---- orig/DomainC.h Tue Apr 24 23:48:52 2001 -+++ DomainC.h Tue Apr 24 13:44:40 2001 -@@ -19,8 +19,8 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#ifndef _TAO_IDL_DOMAINC_H_ --#define _TAO_IDL_DOMAINC_H_ -+#ifndef _TAO_IDL_CORBA_DOMAINC_H_ -+#define _TAO_IDL_CORBA_DOMAINC_H_ - - #include "ace/pre.h" - #include "tao/corba.h" -@@ -29,8 +29,8 @@ - # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - --#include "tao/corbafwd.h" --#include "PolicyC.h" -+#include "tao/TAO_Export.h" -+#include "tao/PolicyC.h" - - #if defined (TAO_EXPORT_MACRO) - #undef TAO_EXPORT_MACRO -@@ -55,91 +55,6 @@ - #pragma option push -w-rvl -w-rch -w-ccc -w-inl - #endif /* __BORLANDC__ */ - --TAO_NAMESPACE CORBA --{ -- TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SecConstruction; -- -- --} --TAO_NAMESPACE_CLOSE // module CORBA -- --class CORBA_InterfaceDef; -- --#if !defined (_CORBA_INTERFACEDEF___PTR_CH_) --#define _CORBA_INTERFACEDEF___PTR_CH_ -- --typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr; -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_INTERFACEDEF___VAR_CH_) --#define _CORBA_INTERFACEDEF___VAR_CH_ -- --class TAO_Export CORBA_InterfaceDef_var : public TAO_Base_var --{ --public: -- CORBA_InterfaceDef_var (void); // default constructor -- CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr p) : ptr_ (p) {} -- CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor -- ~CORBA_InterfaceDef_var (void); // destructor -- -- CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr); -- CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &); -- CORBA_InterfaceDef_ptr operator-> (void) const; -- -- operator const CORBA_InterfaceDef_ptr &() const; -- operator CORBA_InterfaceDef_ptr &(); -- // in, inout, out, _retn -- CORBA_InterfaceDef_ptr in (void) const; -- CORBA_InterfaceDef_ptr &inout (void); -- CORBA_InterfaceDef_ptr &out (void); -- CORBA_InterfaceDef_ptr _retn (void); -- CORBA_InterfaceDef_ptr ptr (void) const; -- -- // Hooks used by template sequence and object manager classes -- // for non-defined forward declared interfaces. -- static CORBA_InterfaceDef_ptr duplicate (CORBA_InterfaceDef_ptr); -- static void release (CORBA_InterfaceDef_ptr); -- static CORBA_InterfaceDef_ptr nil (void); -- static CORBA_InterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &); -- static CORBA::Object * upcast (void *); -- --private: -- CORBA_InterfaceDef_ptr ptr_; -- // Unimplemented - prevents widening assignment. -- CORBA_InterfaceDef_var (const TAO_Base_var &rhs); -- CORBA_InterfaceDef_var &operator= (const TAO_Base_var &rhs); --}; -- -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_INTERFACEDEF___OUT_CH_) --#define _CORBA_INTERFACEDEF___OUT_CH_ -- --class TAO_Export CORBA_InterfaceDef_out --{ --public: -- CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &); -- CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &); -- CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &); -- CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &); -- CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &); -- CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr); -- operator CORBA_InterfaceDef_ptr &(); -- CORBA_InterfaceDef_ptr &ptr (void); -- CORBA_InterfaceDef_ptr operator-> (void); -- --private: -- CORBA_InterfaceDef_ptr &ptr_; --}; -- -- --#endif /* end #if !defined */ -- -- - #if !defined (_CORBA_DOMAINMANAGER___PTR_CH_) - #define _CORBA_DOMAINMANAGER___PTR_CH_ - -@@ -252,7 +167,7 @@ - - static void _tao_any_destructor (void*); - -- virtual CORBA_Policy_ptr get_domain_policy ( -+ virtual CORBA::Policy_ptr get_domain_policy ( - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -312,7 +227,7 @@ - public: - virtual ~_TAO_CORBA_DomainManager_Proxy_Impl (void) { } - -- virtual CORBA_Policy_ptr get_domain_policy ( -+ virtual CORBA::Policy_ptr get_domain_policy ( - CORBA_Object *_collocated_tao_target_, - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV -@@ -343,7 +258,7 @@ - - virtual ~_TAO_CORBA_DomainManager_Remote_Proxy_Impl (void) { } - -- virtual CORBA_Policy_ptr get_domain_policy ( -+ virtual CORBA::Policy_ptr get_domain_policy ( - CORBA_Object *_collocated_tao_target_, - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV -@@ -511,7 +426,7 @@ - class _TAO_CORBA_ConstructionPolicy_Proxy_Broker; - class _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker; - --class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA_Policy -+class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA::Policy - { - public: - #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -@@ -539,7 +454,7 @@ - static void _tao_any_destructor (void*); - - virtual void make_domain_manager ( -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -602,7 +517,7 @@ - - virtual void make_domain_manager ( - CORBA_Object *_collocated_tao_target_, -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -636,7 +551,7 @@ - - virtual void make_domain_manager ( - CORBA_Object *_collocated_tao_target_, -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -883,38 +798,6 @@ - CORBA::Object_ptr obj - ); - --// External declarations for undefined interface --// CORBA_InterfaceDef --TAO_Export --CORBA_InterfaceDef_ptr --tao_CORBA_InterfaceDef_duplicate ( -- CORBA_InterfaceDef_ptr -- ); --extern TAO_Export --void --tao_CORBA_InterfaceDef_release ( -- CORBA_InterfaceDef_ptr -- ); --extern TAO_Export --CORBA_InterfaceDef_ptr --tao_CORBA_InterfaceDef_nil ( -- void -- ); --extern TAO_Export --CORBA_InterfaceDef_ptr --tao_CORBA_InterfaceDef_narrow ( -- CORBA::Object *, -- CORBA::Environment & -- ); --extern TAO_Export --CORBA::Object * --tao_CORBA_InterfaceDef_upcast ( -- void * -- ); -- --// Any operators for interface CORBA_InterfaceDef --TAO_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef_ptr); --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef *&); - // Any operators for interface CORBA_DomainManager - TAO_Export void operator<<= (CORBA::Any &, CORBA_DomainManager_ptr); - TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManager *&); -@@ -928,8 +811,6 @@ - - #ifndef __ACE_INLINE__ - --TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef_ptr ); --TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef_ptr &); - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_DomainManager_ptr ); - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_DomainManager_ptr &); - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstructionPolicy_ptr ); diff --git a/TAO/tao/diffs/DomainC.i.diff b/TAO/tao/diffs/DomainC.i.diff deleted file mode 100644 index f244887df28..00000000000 --- a/TAO/tao/diffs/DomainC.i.diff +++ /dev/null @@ -1,152 +0,0 @@ ---- orig/DomainC.i Tue Apr 24 23:48:52 2001 -+++ DomainC.i Tue Apr 24 13:44:40 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,6 +23,49 @@ - #if !defined (_CORBA_DOMAINMANAGER___CI_) - #define _CORBA_DOMAINMANAGER___CI_ - -+ACE_INLINE CORBA_DomainManager_ptr -+tao_CORBA_DomainManager_duplicate ( -+ CORBA_DomainManager_ptr p -+ ) -+{ -+ return CORBA_DomainManager::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_CORBA_DomainManager_release ( -+ CORBA_DomainManager_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE CORBA_DomainManager_ptr -+tao_CORBA_DomainManager_nil ( -+ void -+ ) -+{ -+ return CORBA_DomainManager::_nil (); -+} -+ -+ACE_INLINE CORBA_DomainManager_ptr -+tao_CORBA_DomainManager_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return CORBA_DomainManager::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_CORBA_DomainManager_upcast ( -+ void *src -+ ) -+{ -+ CORBA_DomainManager **tmp = -+ ACE_static_cast (CORBA_DomainManager **, src); -+ return *tmp; -+} -+ - ACE_INLINE - CORBA_DomainManager::CORBA_DomainManager ( - TAO_Stub *objref, -@@ -41,6 +84,49 @@ - #if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_) - #define _CORBA_CONSTRUCTIONPOLICY___CI_ - -+ACE_INLINE CORBA_ConstructionPolicy_ptr -+tao_CORBA_ConstructionPolicy_duplicate ( -+ CORBA_ConstructionPolicy_ptr p -+ ) -+{ -+ return CORBA_ConstructionPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_CORBA_ConstructionPolicy_release ( -+ CORBA_ConstructionPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE CORBA_ConstructionPolicy_ptr -+tao_CORBA_ConstructionPolicy_nil ( -+ void -+ ) -+{ -+ return CORBA_ConstructionPolicy::_nil (); -+} -+ -+ACE_INLINE CORBA_ConstructionPolicy_ptr -+tao_CORBA_ConstructionPolicy_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return CORBA_ConstructionPolicy::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_CORBA_ConstructionPolicy_upcast ( -+ void *src -+ ) -+{ -+ CORBA_ConstructionPolicy **tmp = -+ ACE_static_cast (CORBA_ConstructionPolicy **, src); -+ return *tmp; -+} -+ - ACE_INLINE - CORBA_ConstructionPolicy::CORBA_ConstructionPolicy ( - TAO_Stub *objref, -@@ -429,32 +515,22 @@ - - #endif /* end #if !defined */ - --TAO_Export CORBA::Boolean operator<< ( -- TAO_OutputCDR &, -- const CORBA_InterfaceDef_ptr -- ); -- --TAO_Export CORBA::Boolean operator>> ( -- TAO_InputCDR &, -- CORBA_InterfaceDef_ptr & -- ); -- --TAO_Export CORBA::Boolean operator<< ( -+CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const CORBA_DomainManager_ptr - ); - --TAO_Export CORBA::Boolean operator>> ( -+CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - CORBA_DomainManager_ptr & - ); - --TAO_Export CORBA::Boolean operator<< ( -+CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const CORBA_ConstructionPolicy_ptr - ); - --TAO_Export CORBA::Boolean operator>> ( -+CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - CORBA_ConstructionPolicy_ptr & - ); -@@ -473,4 +549,3 @@ - ); - - #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_I_ */ -- diff --git a/TAO/tao/diffs/DomainS.cpp.diff b/TAO/tao/diffs/DomainS.cpp.diff deleted file mode 100644 index 06189c37d3c..00000000000 --- a/TAO/tao/diffs/DomainS.cpp.diff +++ /dev/null @@ -1,460 +0,0 @@ ---- orig/DomainS.cpp Tue Apr 3 17:47:31 2001 -+++ patched/DomainS.cpp Tue Apr 3 20:50:49 2001 -@@ -34,6 +34,7 @@ - #if TAO_HAS_INTERCEPTORS == 1 - #include "tao/RequestInfo_Util.h" - #endif /* TAO_HAS_INTERCEPTORS == 1 */ -+#include "tao/IFR_Client/IFR_ExtendedC.h" - - #include "ace/Dynamic_Service.h" - #if defined (__BORLANDC__) -@@ -44,412 +45,6 @@ - #include "DomainS.i" - #endif /* !defined INLINE */ - --class TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable --{ --private: -- unsigned int hash (const char *str, unsigned int len); --public: -- const TAO_operation_db_entry * lookup (const char *str, unsigned int len); --}; --/* starting time is 17:47:31 */ --/* C++ code produced by gperf version 2.8 (ACE version) */ --/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup */ --unsigned int --TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) --{ -- static const unsigned char asso_values[] = -- { --#if defined (ACE_MVS) -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, -- 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, --#else -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 0, 14, 0, 14, 14, -- 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, -- 14, 14, 14, 14, 14, 14, 14, 14, --#endif /* ACE_MVS */ -- }; -- return len + asso_values[str[len - 1]] + asso_values[str[0]]; --} -- --const class TAO_operation_db_entry * --TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) --{ -- enum -- { -- TOTAL_KEYWORDS = 3, -- MIN_WORD_LENGTH = 5, -- MAX_WORD_LENGTH = 13, -- MIN_HASH_VALUE = 5, -- MAX_HASH_VALUE = 13, -- HASH_VALUE_RANGE = 9, -- DUPLICATES = 0 -- }; -- -- static const class TAO_operation_db_entry wordlist[] = -- { -- {"",0},{"",0},{"",0},{"",0},{"",0}, -- {"_is_a", &POA_CORBA::InterfaceDef::_is_a_skel}, -- {"",0},{"",0},{"",0},{"",0}, -- {"_interface", &POA_CORBA::InterfaceDef::_interface_skel}, -- {"",0},{"",0}, -- {"_non_existent", &POA_CORBA::InterfaceDef::_non_existent_skel}, -- }; -- -- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) -- { -- unsigned int key = hash (str, len); -- -- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) -- { -- const char *s = wordlist[key].opname_; -- -- if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) -- return &wordlist[key]; -- } -- } -- return 0; --} --/* ending time is 17:47:31 */ --static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable; -- --#if (TAO_HAS_INTERCEPTORS == 1) --#endif /* TAO_HAS_INTERCEPTORS */ -- --/////////////////////////////////////////////////////////////////////// --// Strategized Proxy Broker Implementation --// -- --// Factory function Implementation. --POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker (void) --{ -- static POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker; -- return &strategized_proxy_broker; --} -- --POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::_TAO_InterfaceDef_Strategized_Proxy_Broker (void) --{ -- for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) -- this->proxy_cache_[i] = 0; -- --} -- --POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::~_TAO_InterfaceDef_Strategized_Proxy_Broker (void) --{ -- for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) -- delete this->proxy_cache_[i]; -- --} -- --CORBA::_TAO_InterfaceDef_Proxy_Impl& --POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::select_proxy ( -- ::CORBA::InterfaceDef *object, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- int strategy = -- TAO_ORB_Core::collocation_strategy (object); -- -- if (this->proxy_cache_[strategy] != 0) -- return *this->proxy_cache_[strategy]; -- -- this->create_proxy (strategy, ACE_TRY_ENV); -- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); -- -- return *this->proxy_cache_[strategy]; -- --} -- --void --POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( -- int strategy, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); -- -- if (this->proxy_cache_[strategy] == 0) -- { -- switch (strategy) -- { -- case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: -- ACE_NEW_THROW_EX ( -- this->proxy_cache_[strategy], -- POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl, -- CORBA::NO_MEMORY () -- ); -- ACE_CHECK; -- break; -- -- case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: -- ACE_NEW_THROW_EX ( -- this->proxy_cache_[strategy], -- POA_CORBA::_TAO_InterfaceDef_Direct_Proxy_Impl, -- CORBA::NO_MEMORY () -- ); -- ACE_CHECK; -- break; -- -- case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: -- default: -- ACE_NEW_THROW_EX ( -- this->proxy_cache_[strategy], -- ::CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl, -- CORBA::NO_MEMORY () -- ); -- ACE_CHECK; -- break; -- -- } -- -- } --} -- -- --// --// End Strategized Proxy Broker Implementation --/////////////////////////////////////////////////////////////////////// -- -- --CORBA::_TAO_InterfaceDef_Proxy_Broker * --CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) --{ -- ACE_UNUSED_ARG (obj); -- return ::POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker(); --} -- --int --CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_) --{ -- ACE_UNUSED_ARG (_dummy_); -- -- CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer = -- CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function; -- -- return 0; --} -- --static int CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = -- CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer)); -- -- --/////////////////////////////////////////////////////////////////////// --// ThruPOA Proxy Implementation --// -- --POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) --{} -- --// ThruPOA Implementation of the IDL interface methods -- --// --// End ThruPOA Proxy Implementation --/////////////////////////////////////////////////////////////////////// -- -- --/////////////////////////////////////////////////////////////////////// --// Direct Proxy Implementation --// -- --POA_CORBA::_TAO_InterfaceDef_Direct_Proxy_Impl::_TAO_InterfaceDef_Direct_Proxy_Impl (void) --{} -- -- --// --// End Direct Proxy Implementation --/////////////////////////////////////////////////////////////////////// --// skeleton constructor --POA_CORBA::InterfaceDef::InterfaceDef (void) --{ -- this->optable_ = &tao_CORBA_InterfaceDef_optable; --} -- --// copy ctor --POA_CORBA::InterfaceDef::InterfaceDef (const InterfaceDef& rhs) -- : TAO_ServantBase (rhs) --{} -- --// skeleton destructor --POA_CORBA::InterfaceDef::~InterfaceDef (void) --{ --} -- --void POA_CORBA::InterfaceDef::_is_a_skel ( -- TAO_ServerRequest &_tao_server_request, -- void * _tao_object_reference, -- void * /* context */, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- TAO_InputCDR &_tao_in = _tao_server_request.incoming (); -- POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *) _tao_object_reference; -- CORBA::Boolean _tao_retval = 0; -- CORBA::String_var value; -- if (!(_tao_in >> value.out ())) -- ACE_THROW (CORBA::MARSHAL ()); -- -- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); -- ACE_CHECK; -- -- _tao_server_request.init_reply (); -- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) -- ACE_THROW (CORBA::MARSHAL ()); --} -- --void POA_CORBA::InterfaceDef::_non_existent_skel ( -- TAO_ServerRequest &_tao_server_request, -- void * _tao_object_reference, -- void * /* context */, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *) _tao_object_reference; -- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); -- ACE_CHECK; -- -- _tao_server_request.init_reply (); -- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) -- ACE_THROW (CORBA::MARSHAL ()); --} -- --void POA_CORBA::InterfaceDef::_interface_skel ( -- TAO_ServerRequest &_tao_server_request, -- void * _tao_object_reference, -- void * /* context */, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *) _tao_object_reference; -- CORBA_InterfaceDef_ptr _tao_retval = 0; -- CORBA::Boolean _tao_result = 0; -- -- TAO_IFR_Client_Adapter *_tao_adapter = -- ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( -- TAO_ORB_Core::ifr_client_adapter_name () -- ); -- -- if (_tao_adapter == 0) -- { -- ACE_THROW (CORBA::INTF_REPOS ()); -- } -- -- ACE_TRY -- { -- _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); -- ACE_TRY_CHECK; -- -- _tao_server_request.init_reply (); -- -- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- -- _tao_result = -- _tao_adapter->interfacedef_cdr_insert ( -- _tao_out, -- _tao_retval -- ); -- } -- ACE_CATCHALL -- { -- _tao_adapter->dispose (_tao_retval); -- } -- ACE_ENDTRY; -- -- if (_tao_result == 0) -- { -- ACE_THROW (CORBA::MARSHAL ()); -- } --} -- --CORBA::Boolean POA_CORBA::InterfaceDef::_is_a ( -- const char* value, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); -- ACE_CHECK_RETURN (0); -- -- if ( -- (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/InterfaceDef:1.0")) || -- (!ACE_OS::strcmp ((char *)value, base_id))) -- return 1; -- else -- return 0; --} -- --void* POA_CORBA::InterfaceDef::_downcast ( -- const char* logical_type_id -- ) --{ -- if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA/InterfaceDef:1.0") == 0) -- return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this); -- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) -- return ACE_static_cast(PortableServer::Servant, this); -- return 0; --} -- --void POA_CORBA::InterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) --{ -- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV); --} -- --const char* POA_CORBA::InterfaceDef::_interface_repository_id (void) const --{ -- return "IDL:CORBA/InterfaceDef:1.0"; --} -- --CORBA::InterfaceDef* --POA_CORBA::InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV) --{ -- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); -- ACE_CHECK_RETURN (0); -- -- CORBA::Object_ptr tmp = CORBA::Object::_nil (); -- -- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) -- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); -- else -- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); -- -- CORBA::Object_var obj = tmp; -- return ::CORBA::InterfaceDef::_unchecked_narrow (obj.in ()); --} -- -- - class TAO_CORBA_DomainManager_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable - { - private: -@@ -1318,9 +913,17 @@ - - Dynamic::ParameterList_var safe_parameter_list = parameter_list; - -+ TAO_IFR_Client_Adapter *adapter = -+ ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( -+ TAO_ORB_Core::ifr_client_adapter_name () -+ ); -+ - CORBA::ULong length_object_type = parameter_list->length (); - parameter_list->length (length_object_type + 1); -- (*parameter_list)[length_object_type].argument <<= this->object_type_; -+ adapter->interfacedef_any_insert ( -+ (*parameter_list)[length_object_type].argument, -+ this->object_type_ -+ ); - - (*parameter_list)[length_object_type].mode = Dynamic::PARAM_IN; - -@@ -1582,7 +1185,7 @@ - - // copy ctor - POA_CORBA_ConstructionPolicy::POA_CORBA_ConstructionPolicy (const POA_CORBA_ConstructionPolicy& rhs) -- : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), -+ : POA_CORBA_Policy (rhs), - TAO_ServantBase (rhs) - {} - -@@ -1786,7 +1389,7 @@ - if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA_ConstructionPolicy:1.0") == 0) - return ACE_static_cast (POA_CORBA_ConstructionPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) -- return ACE_static_cast (POA_CORBA::Policy_ptr, this); -+ return ACE_static_cast (POA_CORBA_Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; diff --git a/TAO/tao/diffs/DomainS.h.diff b/TAO/tao/diffs/DomainS.h.diff deleted file mode 100644 index 4ffb3b6192a..00000000000 --- a/TAO/tao/diffs/DomainS.h.diff +++ /dev/null @@ -1,222 +0,0 @@ ---- orig/DomainS.h Mon Apr 30 22:11:10 2001 -+++ DomainS.h Mon Apr 30 22:01:45 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -19,13 +19,13 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#ifndef _TAO_IDL_DOMAINS_H_ --#define _TAO_IDL_DOMAINS_H_ -+#ifndef _TAO_IDL_ORIG_DOMAINS_H_ -+#define _TAO_IDL_ORIG_DOMAINS_H_ - - #include "ace/pre.h" --#include "../../orig/PolicyS.h" --#include "DomainC.h" -- -+#include "domain_export.h" -+#include "tao/DomainC.h" -+#include "tao/PortableServer/PolicyS.h" - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - # pragma once -@@ -47,15 +47,11 @@ - #pragma option push -w-rvl -w-rch -w-ccc -w-inl - #endif /* __BORLANDC__ */ - --TAO_NAMESPACE POA_CORBA --{ --} --TAO_NAMESPACE_CLOSE // module CORBA -- - class POA_CORBA_DomainManager; - typedef POA_CORBA_DomainManager *POA_CORBA_DomainManager_ptr; - // Forward Classes Declaration - class _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl; -+class _TAO_CORBA_DomainManager_Direct_Proxy_Impl; - class _TAO_CORBA_DomainManager_Strategized_Proxy_Broker; - - class TAO_Domain_Export POA_CORBA_DomainManager : public virtual PortableServer::ServantBase -@@ -116,7 +112,7 @@ - - virtual const char* _interface_repository_id (void) const; - -- virtual CORBA_Policy_ptr get_domain_policy ( -+ virtual CORBA::Policy_ptr get_domain_policy ( - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -154,6 +150,7 @@ - ); - - private: -+ - // Helper methods that takes care to create the proxy - // as soon as their use is necessary. - void create_proxy ( -@@ -161,6 +158,8 @@ - CORBA::Environment &ACE_TRY_ENV - ); - -+private: -+ - // Caches the proxy implementations. The proxy implementation - // are totally stateless, and those can be shared by all the - // instances of a given IDL interface type. -@@ -195,7 +194,7 @@ - - virtual ~_TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl (void) { } - -- virtual CORBA_Policy_ptr get_domain_policy ( -+ virtual CORBA::Policy_ptr get_domain_policy ( - CORBA_Object *_collocated_tao_target_, - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV -@@ -204,18 +203,48 @@ - CORBA::SystemException - )); - -- - }; - -+ - // - // ThruPOA Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - - -+/////////////////////////////////////////////////////////////////////// -+// Direct Impl. Declaration -+// -+ -+class TAO_Domain_Export _TAO_CORBA_DomainManager_Direct_Proxy_Impl : -+ public virtual _TAO_CORBA_DomainManager_Proxy_Impl, -+ public virtual TAO_Direct_Object_Proxy_Impl -+{ -+public: -+ _TAO_CORBA_DomainManager_Direct_Proxy_Impl (void); -+ -+ virtual ~_TAO_CORBA_DomainManager_Direct_Proxy_Impl (void) { } -+ -+ virtual CORBA::Policy_ptr get_domain_policy ( -+ CORBA_Object *_collocated_tao_target_, -+ CORBA::PolicyType policy_type, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+ ACE_THROW_SPEC (( -+ CORBA::SystemException -+ )); -+ -+}; -+ -+ -+// -+// Direct Proxy Impl. Declaration -+/////////////////////////////////////////////////////////////////////// -+ - class POA_CORBA_ConstructionPolicy; - typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr; - // Forward Classes Declaration - class _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl; -+class _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl; - class _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker; - - class TAO_Domain_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA_Policy -@@ -277,7 +306,7 @@ - virtual const char* _interface_repository_id (void) const; - - virtual void make_domain_manager ( -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -339,6 +368,7 @@ - ); - - private: -+ - // Helper methods that takes care to create the proxy - // as soon as their use is necessary. - void create_proxy ( -@@ -346,6 +376,8 @@ - CORBA::Environment &ACE_TRY_ENV - ); - -+private: -+ - // Caches the proxy implementations. The proxy implementation - // are totally stateless, and those can be shared by all the - // instances of a given IDL interface type. -@@ -374,7 +406,7 @@ - class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl : - public virtual ::_TAO_CORBA_ConstructionPolicy_Proxy_Impl, - public virtual TAO_ThruPOA_Object_Proxy_Impl, -- public virtual ::_TAO_CORBA_Policy_ThruPOA_Proxy_Impl -+ public virtual _TAO_CORBA_Policy_ThruPOA_Proxy_Impl - - { - public: -@@ -384,7 +416,7 @@ - - virtual void make_domain_manager ( - CORBA_Object *_collocated_tao_target_, -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -392,13 +424,45 @@ - CORBA::SystemException - )); - -- - }; - -+ - // - // ThruPOA Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - -+ -+/////////////////////////////////////////////////////////////////////// -+// Direct Impl. Declaration -+// -+ -+class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl : -+ public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl, -+ public virtual TAO_Direct_Object_Proxy_Impl, -+ public virtual _TAO_CORBA_Policy_Direct_Proxy_Impl -+ -+{ -+public: -+ _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl (void); -+ -+ virtual ~_TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl (void) { } -+ -+ virtual void make_domain_manager ( -+ CORBA_Object *_collocated_tao_target_, -+ CORBA::InterfaceDef_ptr object_type, -+ CORBA::Boolean constr_policy, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+ ACE_THROW_SPEC (( -+ CORBA::SystemException -+ )); -+ -+}; -+ -+ -+// -+// Direct Proxy Impl. Declaration -+/////////////////////////////////////////////////////////////////////// - - #include "DomainS_T.h" - diff --git a/TAO/tao/diffs/DomainS.i.diff b/TAO/tao/diffs/DomainS.i.diff deleted file mode 100644 index ddffd043124..00000000000 --- a/TAO/tao/diffs/DomainS.i.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- orig/DomainS.i Tue Apr 3 17:47:30 2001 -+++ patched/DomainS.i Tue Apr 3 20:45:37 2001 -@@ -26,10 +26,10 @@ - CORBA::Environment &ACE_TRY_ENV - ) - { -- POA_CORBA::Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; -- POA_CORBA::Policy::_get_policy_type_skel ( -+ POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; -+ POA_CORBA_Policy::_get_policy_type_skel ( - req, -- (POA_CORBA::Policy_ptr) impl, -+ (POA_CORBA_Policy_ptr) impl, - context, - ACE_TRY_ENV - ); -@@ -41,10 +41,10 @@ - CORBA::Environment &ACE_TRY_ENV - ) - { -- POA_CORBA::Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; -- POA_CORBA::Policy::copy_skel ( -+ POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; -+ POA_CORBA_Policy::copy_skel ( - req, -- (POA_CORBA::Policy_ptr) impl, -+ (POA_CORBA_Policy_ptr) impl, - context, - ACE_TRY_ENV - ); -@@ -56,10 +56,10 @@ - CORBA::Environment &ACE_TRY_ENV - ) - { -- POA_CORBA::Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; -- POA_CORBA::Policy::destroy_skel ( -+ POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj; -+ POA_CORBA_Policy::destroy_skel ( - req, -- (POA_CORBA::Policy_ptr) impl, -+ (POA_CORBA_Policy_ptr) impl, - context, - ACE_TRY_ENV - ); diff --git a/TAO/tao/diffs/DomainS_T.h.diff b/TAO/tao/diffs/DomainS_T.h.diff deleted file mode 100644 index d85754fdf46..00000000000 --- a/TAO/tao/diffs/DomainS_T.h.diff +++ /dev/null @@ -1,68 +0,0 @@ ---- orig/DomainS_T.h Mon Apr 30 22:11:10 2001 -+++ DomainS_T.h Mon Apr 30 22:02:30 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -19,8 +19,8 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#ifndef _TAO_IDL_DOMAINS_T_H_ --#define _TAO_IDL_DOMAINS_T_H_ -+#ifndef _TAO_IDL_ORIG_DOMAINS_T_H_ -+#define _TAO_IDL_ORIG_DOMAINS_T_H_ - - #include "ace/pre.h" - #if defined(_MSC_VER) -@@ -32,11 +32,6 @@ - - #if defined (ACE_HAS_USING_KEYWORD) - --TAO_NAMESPACE POA_CORBA --{ --} --TAO_NAMESPACE_CLOSE // module CORBA -- - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager -@@ -70,7 +65,7 @@ - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- CORBA_Policy_ptr get_domain_policy ( -+ CORBA::Policy_ptr get_domain_policy ( - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -89,6 +84,7 @@ - void operator= (const POA_CORBA_DomainManager_tie &); - }; - -+ - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Domain_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy -@@ -123,7 +119,7 @@ - TAO_default_environment () - ); - void make_domain_manager ( -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -140,7 +136,7 @@ - CORBA::SystemException - )); - -- CORBA_Policy_ptr copy ( -+ CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) diff --git a/TAO/tao/diffs/DomainS_T.i.diff b/TAO/tao/diffs/DomainS_T.i.diff deleted file mode 100644 index f2ca3dfb51e..00000000000 --- a/TAO/tao/diffs/DomainS_T.i.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- orig/DomainS_T.i Mon Apr 30 22:11:10 2001 -+++ DomainS_T.i Mon Apr 30 22:03:06 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -99,7 +99,7 @@ - } - - template <class T> ACE_INLINE --CORBA_Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy ( -+CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy ( - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -192,7 +192,7 @@ - - template <class T> ACE_INLINE - void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager ( -- CORBA_InterfaceDef_ptr object_type, -+ CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -221,7 +221,7 @@ - } - - template <class T> ACE_INLINE --CORBA_Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy ( -+CORBA::Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( -@@ -247,3 +247,5 @@ - } - - #endif /* ACE_HAS_USING_KEYWORD */ -+ -+ diff --git a/TAO/tao/diffs/IOP.diff b/TAO/tao/diffs/IOP.diff index f9924c9f401..be76fec2597 100644 --- a/TAO/tao/diffs/IOP.diff +++ b/TAO/tao/diffs/IOP.diff @@ -1,45 +1,19 @@ ---- IOPC.h.old Fri Feb 23 15:57:27 2001 -+++ IOPC.h Fri Feb 23 18:22:02 2001 -@@ -23,13 +23,18 @@ - #define _TAO_IDL_IOPC_H_ +--- orig/IOPC.h Tue Feb 5 14:56:23 2002 ++++ IOPC.h Tue Feb 5 14:57:05 2002 +@@ -23,13 +23,15 @@ + #define _TAO_IDL_ORIG_IOPC_H_ #include "ace/pre.h" -#include "tao/corba.h" -+ -+#include "TAO_Export.h" ++#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ --#include "TAO_Export.h" -+#include "Any.h" -+#include "Object.h" + #include "TAO_Export.h" +#include "Exception.h" -+#include "CDR.h" -+#include "Sequence.h" ++#include "Object.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO ---- IOPC.cpp.old Fri Feb 23 15:57:27 2001 -+++ IOPC.cpp Fri Feb 23 18:22:02 2001 -@@ -21,10 +21,6 @@ - - #include "IOPC.h" - --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -- - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus - #endif /* __BORLANDC__ */ -@@ -32,6 +28,8 @@ - #if !defined (__ACE_INLINE__) - #include "IOPC.i" - #endif /* !defined INLINE */ -+ -+#include "Typecode.h" - - static const CORBA::Long _oc_IOP_ProfileId[] = - { diff --git a/TAO/tao/diffs/IOPC.cpp.diff b/TAO/tao/diffs/IOPC.cpp.diff deleted file mode 100644 index bb8f1504dbc..00000000000 --- a/TAO/tao/diffs/IOPC.cpp.diff +++ /dev/null @@ -1,227 +0,0 @@ ---- IOPC.cpp Thu May 3 11:29:04 2001 -+++ IOPC.cpp.mod Thu May 3 00:08:59 2001 -@@ -21,13 +21,6 @@ - - #include "IOPC.h" - --#include "tao/Stub.h" --#include "tao/Invocation.h" --#include "tao/ClientRequestInfo.h" --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -- - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus - #endif /* __BORLANDC__ */ -@@ -36,6 +29,9 @@ - #include "IOPC.i" - #endif /* !defined INLINE */ - -+#include "Typecode.h" -+#include "ORB_Core.h" -+ - static const CORBA::Long _oc_IOP_ProfileId[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order -@@ -1571,49 +1567,6 @@ - TAO_NAMESPACE_BEGIN (IOP) - TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13U) - TAO_NAMESPACE_END --IOP::Codec_ptr --tao_IOP_Codec_duplicate ( -- IOP::Codec_ptr p -- ) --{ -- return IOP::Codec::_duplicate (p); --} -- --void --tao_IOP_Codec_release ( -- IOP::Codec_ptr p -- ) --{ -- CORBA::release (p); --} -- --IOP::Codec_ptr --tao_IOP_Codec_nil ( -- void -- ) --{ -- return IOP::Codec::_nil (); --} -- --IOP::Codec_ptr --tao_IOP_Codec_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return IOP::Codec::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_IOP_Codec_upcast ( -- void *src -- ) --{ -- IOP::Codec **tmp = -- ACE_static_cast (IOP::Codec **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class IOP::Codec_var - // ************************************************************* -@@ -2184,49 +2137,6 @@ - delete tmp; - } - --IOP::CodecFactory_ptr --tao_IOP_CodecFactory_duplicate ( -- IOP::CodecFactory_ptr p -- ) --{ -- return IOP::CodecFactory::_duplicate (p); --} -- --void --tao_IOP_CodecFactory_release ( -- IOP::CodecFactory_ptr p -- ) --{ -- CORBA::release (p); --} -- --IOP::CodecFactory_ptr --tao_IOP_CodecFactory_nil ( -- void -- ) --{ -- return IOP::CodecFactory::_nil (); --} -- --IOP::CodecFactory_ptr --tao_IOP_CodecFactory_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return IOP::CodecFactory::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_IOP_CodecFactory_upcast ( -- void *src -- ) --{ -- IOP::CodecFactory **tmp = -- ACE_static_cast (IOP::CodecFactory **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class IOP::CodecFactory_var - // ************************************************************* -@@ -3383,11 +3293,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) -@@ -3453,11 +3358,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -3515,11 +3415,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) -@@ -3581,11 +3476,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -3628,11 +3518,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -3675,11 +3560,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -3735,11 +3615,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) -@@ -3801,11 +3676,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -3816,4 +3686,3 @@ - } - return 0; // error - } -- diff --git a/TAO/tao/diffs/IOPC.h.diff b/TAO/tao/diffs/IOPC.h.diff deleted file mode 100644 index 0255c04143e..00000000000 --- a/TAO/tao/diffs/IOPC.h.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- orig/IOPC.h Tue Apr 24 23:48:58 2001 -+++ IOPC.h Tue Apr 24 13:44:40 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -19,17 +19,21 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#ifndef _TAO_IDL_IOPC_H_ --#define _TAO_IDL_IOPC_H_ -+#ifndef _TAO_IDL_ORIG_IOPC_H_ -+#define _TAO_IDL_ORIG_IOPC_H_ - - #include "ace/pre.h" --#include "tao/corba.h" -+#include "TAO_Export.h" - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - --#include "tao/Export.h" -+#include "Any.h" -+#include "Object.h" -+#include "Exception.h" -+#include "CDR.h" -+#include "Sequence.h" - - #if defined (TAO_EXPORT_MACRO) - #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/diffs/IOPC.i.diff b/TAO/tao/diffs/IOPC.i.diff deleted file mode 100644 index 2a9837f0590..00000000000 --- a/TAO/tao/diffs/IOPC.i.diff +++ /dev/null @@ -1,110 +0,0 @@ ---- orig/IOPC.i Tue Apr 24 23:48:58 2001 -+++ IOPC.i Tue Apr 24 13:44:40 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -2559,6 +2559,49 @@ - #if !defined (_IOP_CODEC___CI_) - #define _IOP_CODEC___CI_ - -+ACE_INLINE IOP::Codec_ptr -+tao_IOP_Codec_duplicate ( -+ IOP::Codec_ptr p -+ ) -+{ -+ return IOP::Codec::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_IOP_Codec_release ( -+ IOP::Codec_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE IOP::Codec_ptr -+tao_IOP_Codec_nil ( -+ void -+ ) -+{ -+ return IOP::Codec::_nil (); -+} -+ -+ACE_INLINE IOP::Codec_ptr -+tao_IOP_Codec_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return IOP::Codec::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_IOP_Codec_upcast ( -+ void *src -+ ) -+{ -+ IOP::Codec **tmp = -+ ACE_static_cast (IOP::Codec **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -2714,6 +2757,49 @@ - - #if !defined (_IOP_CODECFACTORY___CI_) - #define _IOP_CODECFACTORY___CI_ -+ -+ACE_INLINE IOP::CodecFactory_ptr -+tao_IOP_CodecFactory_duplicate ( -+ IOP::CodecFactory_ptr p -+ ) -+{ -+ return IOP::CodecFactory::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_IOP_CodecFactory_release ( -+ IOP::CodecFactory_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE IOP::CodecFactory_ptr -+tao_IOP_CodecFactory_nil ( -+ void -+ ) -+{ -+ return IOP::CodecFactory::_nil (); -+} -+ -+ACE_INLINE IOP::CodecFactory_ptr -+tao_IOP_CodecFactory_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return IOP::CodecFactory::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_IOP_CodecFactory_upcast ( -+ void *src -+ ) -+{ -+ IOP::CodecFactory **tmp = -+ ACE_static_cast (IOP::CodecFactory **, src); -+ return *tmp; -+} - - - #endif /* end #if !defined */ diff --git a/TAO/tao/diffs/ObjectReferenceTemplate.diff b/TAO/tao/diffs/ObjectReferenceTemplate.diff new file mode 100644 index 00000000000..d83ae273b6e --- /dev/null +++ b/TAO/tao/diffs/ObjectReferenceTemplate.diff @@ -0,0 +1,29 @@ +--- orig/ObjectReferenceTemplateC.h Wed Feb 6 19:29:56 2002 ++++ ObjectReferenceTemplateC.h Wed Feb 6 10:00:19 2002 +@@ -23,7 +23,7 @@ + #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once +@@ -32,6 +32,7 @@ + #include "TAO_Export.h" + #include "OctetSeqC.h" + #include "StringSeqC.h" ++#include "ValueBase.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +--- orig/ObjectReferenceTemplateC.cpp Wed Feb 6 19:29:56 2002 ++++ ObjectReferenceTemplateC.cpp Wed Feb 6 18:45:41 2002 +@@ -24,6 +24,7 @@ + #include "tao/Stub.h" + #include "tao/Invocation.h" + #include "tao/PortableInterceptor.h" ++#include "tao/ValueFactory.h" + + #if TAO_HAS_INTERCEPTORS == 1 + #include "tao/RequestInfo_Util.h" diff --git a/TAO/tao/diffs/OctetSeqC.cpp.diff b/TAO/tao/diffs/OctetSeqC.cpp.diff deleted file mode 100644 index 76d270ac9ca..00000000000 --- a/TAO/tao/diffs/OctetSeqC.cpp.diff +++ /dev/null @@ -1,264 +0,0 @@ ---- OctetSeqC.cpp Thu May 3 11:29:05 2001 -+++ OctetSeqC.cpp.mod Wed May 2 23:32:41 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -21,13 +21,6 @@ - - #include "OctetSeqC.h" - --#include "tao/Stub.h" --#include "tao/Invocation.h" --#include "tao/ClientRequestInfo.h" --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -- - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus - #endif /* __BORLANDC__ */ -@@ -36,6 +29,10 @@ - #include "OctetSeqC.i" - #endif /* !defined INLINE */ - -+#include "Any.h" -+#include "CDR.h" -+#include "Typecode.h" -+#include "ORB_Core.h" - - #if !defined (_CORBA_OCTETSEQ_CS_) - #define _CORBA_OCTETSEQ_CS_ -@@ -44,9 +41,9 @@ - // CORBA::OctetSeq - // ************************************************************* - --CORBA::OctetSeq::OctetSeq (void) -+CORBA_OctetSeq::CORBA_OctetSeq (void) - {} --CORBA::OctetSeq::OctetSeq (CORBA::ULong max) // uses max size -+CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max) // uses max size - : - #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -@@ -55,7 +52,7 @@ - #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) - {} --CORBA::OctetSeq::OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) -+CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : - #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -@@ -64,7 +61,7 @@ - #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) - {} --CORBA::OctetSeq::OctetSeq (const OctetSeq &seq) // copy ctor -+CORBA_OctetSeq::CORBA_OctetSeq (const CORBA_OctetSeq &seq) // copy ctor - : - #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -@@ -73,11 +70,11 @@ - #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) - {} --CORBA::OctetSeq::~OctetSeq (void) // dtor -+CORBA_OctetSeq::~CORBA_OctetSeq (void) // dtor - {} --void CORBA::OctetSeq::_tao_any_destructor (void *x) -+void CORBA_OctetSeq::_tao_any_destructor (void *x) - { -- OctetSeq *tmp = ACE_static_cast (OctetSeq*,x); -+ CORBA_OctetSeq *tmp = ACE_static_cast (CORBA_OctetSeq*,x); - delete tmp; - } - -@@ -87,19 +84,8 @@ - static const CORBA::Long _oc_CORBA_OctetSeq[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order -- 31, -- ACE_NTOHL (0x49444c3a), -- ACE_NTOHL (0x6f6d672e), -- ACE_NTOHL (0x6f72672f), -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x412f4f63), -- ACE_NTOHL (0x74657453), -- ACE_NTOHL (0x65713a31), -- ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 -- 9, -- ACE_NTOHL (0x4f637465), -- ACE_NTOHL (0x74536571), -- ACE_NTOHL (0x0), // name = OctetSeq -+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f63), ACE_NTOHL (0x74657453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 -+ 9, ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order -@@ -108,15 +94,7 @@ - 0U, - - }; -- --static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq ( -- CORBA::tk_alias, -- sizeof (_oc_CORBA_OctetSeq), -- (char *) &_oc_CORBA_OctetSeq, -- 0, -- sizeof (CORBA::OctetSeq) -- ); -- -+static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA_OctetSeq)); - TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) - TAO_NAMESPACE_BEGIN (CORBA) - TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq) -@@ -124,7 +102,7 @@ - - void operator<<= ( - CORBA::Any &_tao_any, -- const CORBA::OctetSeq &_tao_elem -+ const CORBA_OctetSeq &_tao_elem - ) // copying - { - TAO_OutputCDR stream; -@@ -138,7 +116,7 @@ - } - } - --void operator<<= (CORBA::Any &_tao_any, CORBA::OctetSeq *_tao_elem) // non copying -+void operator<<= (CORBA::Any &_tao_any, CORBA_OctetSeq *_tao_elem) // non copying - { - TAO_OutputCDR stream; - stream << *_tao_elem; -@@ -148,43 +126,45 @@ - stream.begin (), - 1, - _tao_elem, -- CORBA::OctetSeq::_tao_any_destructor -+ CORBA_OctetSeq::_tao_any_destructor - ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OctetSeq *&_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OctetSeq *&_tao_elem) - { - return _tao_any >>= ACE_const_cast( -- const CORBA::OctetSeq*&, -+ const CORBA_OctetSeq*&, - _tao_elem - ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OctetSeq *&_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_tao_elem) - { - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); -- -- CORBA::Boolean result = type->equivalent (CORBA::_tc_OctetSeq, ACE_TRY_ENV); -+ CORBA::Boolean result = -+ type->equivalent (CORBA::_tc_OctetSeq, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -- return 0; // not equivalent -+ { -+ return 0; -+ } - - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( -- const CORBA::OctetSeq*, -+ const CORBA_OctetSeq*, - _tao_any.value () - ); - return 1; - } - else - { -- CORBA::OctetSeq *tmp; -- ACE_NEW_RETURN (tmp, CORBA::OctetSeq, 0); -+ CORBA_OctetSeq *tmp; -+ ACE_NEW_RETURN (tmp, CORBA_OctetSeq, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () -@@ -195,7 +175,7 @@ - CORBA::_tc_OctetSeq, - 1, - ACE_static_cast (void *, tmp), -- CORBA::OctetSeq::_tao_any_destructor -+ CORBA_OctetSeq::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; -@@ -215,7 +195,7 @@ - - CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, -- const CORBA::OctetSeq &_tao_sequence -+ const CORBA_OctetSeq &_tao_sequence - ) - { - if (strm << _tao_sequence.length ()) -@@ -225,7 +205,7 @@ - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = -- ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence); -+ ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_OctetSeq *)&_tao_sequence); - if (oseq->mb ()) - return strm.write_octet_array_mb (oseq->mb ()); - else -@@ -242,7 +222,7 @@ - - CORBA::Boolean operator>> ( - TAO_InputCDR &strm, -- CORBA::OctetSeq &_tao_sequence -+ CORBA_OctetSeq &_tao_sequence - ) - { - CORBA::ULong _tao_seq_len; -@@ -253,11 +233,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) -@@ -265,6 +240,7 @@ - ACE_Message_Block::DONT_DELETE)) - { - TAO_ORB_Core* orb_core = strm.orb_core (); -+ - if (orb_core != 0 && - strm.orb_core ()->resource_factory ()-> - input_cdr_allocator_type_locked () == 1) -@@ -277,7 +253,9 @@ - return 1; - } - } -+ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); -+ - #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -@@ -285,4 +263,3 @@ - } - return 0; // error - } -- diff --git a/TAO/tao/diffs/Policy.diff b/TAO/tao/diffs/Policy.diff new file mode 100644 index 00000000000..ad04c75b097 --- /dev/null +++ b/TAO/tao/diffs/Policy.diff @@ -0,0 +1,93 @@ +--- orig/PolicyC.h Wed Feb 6 19:31:31 2002 ++++ PolicyC.h Wed Feb 6 19:34:42 2002 +@@ -23,7 +23,7 @@ + #define _TAO_IDL_ORIG_POLICYC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once +@@ -32,6 +32,9 @@ + #include "TAO_Export.h" + #include "CurrentC.h" + #include "Policy_ForwardC.h" ++#include "Exception.h" ++#include "Remote_Object_Proxy_Impl.h" ++#include "Encodable.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +@@ -346,6 +349,9 @@ + + class TAO_Export Policy + : public virtual CORBA_Object ++ // **************************************************************** ++ , public virtual TAO_Encodable ++ // **************************************************************** + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -407,6 +413,13 @@ + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; ++ ++ // **************************************************************** ++ virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &); ++ virtual CORBA::Boolean _tao_decode (TAO_InputCDR &); ++ virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; ++ virtual TAO_Policy_Scope _tao_scope (void) const; ++ // **************************************************************** + + private: + _TAO_Policy_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; +--- orig/PolicyC.cpp Wed Feb 6 19:31:31 2002 ++++ PolicyC.cpp Wed Feb 6 19:34:42 2002 +@@ -1678,6 +1678,32 @@ + return "IDL:omg.org/CORBA/Policy:1.0"; + } + ++// **************************************************************** ++CORBA::Boolean ++CORBA::Policy::_tao_encode (TAO_OutputCDR &) ++{ ++ return 0; ++} ++ ++CORBA::Boolean ++CORBA::Policy::_tao_decode (TAO_InputCDR &) ++{ ++ return 0; ++} ++ ++TAO_Cached_Policy_Type ++CORBA::Policy::_tao_cached_type (void) const ++{ ++ return TAO_CACHED_POLICY_UNCACHED; ++} ++ ++TAO_Policy_Scope ++CORBA::Policy::_tao_scope (void) const ++{ ++ return TAO_POLICY_DEFAULT_SCOPE; ++} ++// **************************************************************** ++ + CORBA::PolicyType CORBA::Policy::policy_type ( + + ACE_ENV_SINGLE_ARG_DECL +--- orig/PolicyS.h Wed Feb 6 19:31:31 2002 ++++ PortableServer/PolicyS.h Wed Feb 6 19:35:15 2002 +@@ -23,9 +23,7 @@ + #define _TAO_IDL_ORIG_POLICYS_H_ + + #include "ace/pre.h" +-#include "CurrentS.h" +-#include "Policy_ForwardS.h" +-#include "PolicyC.h" ++#include "tao/PolicyC.h" + + + #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/diffs/Policy.pidl.diff b/TAO/tao/diffs/Policy.pidl.diff deleted file mode 100644 index 4a806a4f700..00000000000 --- a/TAO/tao/diffs/Policy.pidl.diff +++ /dev/null @@ -1,96 +0,0 @@ ---- Policy.pidl Sat Jun 24 04:57:24 2000 -+++ Policy.pidl.mod Sat Jun 24 04:40:35 2000 -@@ -78,57 +78,53 @@ - module CORBA - { - typedef short PolicyErrorCode; -- const PolicyErrorCode BAD_POLICY = 0; -- const PolicyErrorCode UNSUPPORTED_POLICY = 1; -- const PolicyErrorCode BAD_POLICY_TYPE = 2; -- const PolicyErrorCode BAD_POLICY_VALUE = 3; -- const PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4; - -- exception PolicyError -- { -- PolicyErrorCode reason; -- }; -- -- exception InvalidPolicies -- { -- sequence<unsigned short> indices; -- }; -- - typedef unsigned long PolicyType; -- interface Policy -- { -- readonly attribute PolicyType policy_type; -- Policy copy (); -- void destroy (); -- }; -- -- typedef sequence<Policy> PolicyList; - -- typedef sequence<PolicyType> PolicyTypeSeq; -- - enum SetOverrideType - { - SET_OVERRIDE, - ADD_OVERRIDE - }; - -- local interface PolicyManager -- { -- PolicyList get_policy_overrides (in PolicyTypeSeq ts); -- void set_policy_overrides ( -- in PolicyList policies, -- in SetOverrideType set_add) -- raises (InvalidPolicies); -- }; -- -- local interface Current -- { -- }; -+}; - -- local interface PolicyCurrent : PolicyManager, Current -- { -- }; -+exception CORBA_PolicyError -+{ -+ CORBA::PolicyErrorCode reason; -+}; -+ -+exception CORBA_InvalidPolicies -+{ -+ sequence<unsigned short> indices; -+}; -+ -+interface CORBA_Policy -+{ -+ readonly attribute CORBA::PolicyType policy_type; -+ CORBA_Policy copy (); -+ void destroy (); -+}; -+ -+typedef sequence<CORBA_Policy> CORBA_PolicyList; -+ -+typedef sequence<CORBA::PolicyType> CORBA_PolicyTypeSeq; -+ -+local interface CORBA_PolicyManager -+{ -+ CORBA_PolicyList get_policy_overrides (in CORBA_PolicyTypeSeq ts); -+ void set_policy_overrides ( -+ in CORBA_PolicyList policies, -+ in CORBA::SetOverrideType set_add) -+ raises (CORBA_InvalidPolicies); -+}; -+ -+local interface CORBA_Current -+{ -+}; - -+local interface CORBA_PolicyCurrent : CORBA_PolicyManager, CORBA_Current -+{ - }; - - #pragma prefix "" diff --git a/TAO/tao/diffs/PolicyC.cpp.diff b/TAO/tao/diffs/PolicyC.cpp.diff deleted file mode 100644 index a0d09b6c87c..00000000000 --- a/TAO/tao/diffs/PolicyC.cpp.diff +++ /dev/null @@ -1,2254 +0,0 @@ ---- orig/PolicyC.cpp Tue Jun 12 17:22:53 2001 -+++ PolicyC.cpp Tue Jun 12 13:58:12 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -39,124 +39,34 @@ - #include "PolicyC.i" - #endif /* !defined INLINE */ - --static const CORBA::Long _oc_CORBA_PolicyErrorCode[] = --{ -- 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_PolicyErrorCode ( -- CORBA::tk_alias, -- sizeof (_oc_CORBA_PolicyErrorCode), -- (char *) &_oc_CORBA_PolicyErrorCode, -- 0, -- sizeof (CORBA::PolicyErrorCode) -- ); -+// **************************************************************** - --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -+TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) - TAO_NAMESPACE_BEGIN (CORBA) --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 -- --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 (CORBA::TypeCode_ptr, _tc_PolicyType, &_tc_TAO_tc_CORBA_PolicyType) -+TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY, 1) - TAO_NAMESPACE_END -- --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::PolicyErrorCode, BAD_POLICY_TYPE, 2) -+TAO_NAMESPACE_END -+TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) - TAO_NAMESPACE_BEGIN (CORBA) --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::PolicyErrorCode) -+TAO_NAMESPACE_BEGIN (CORBA) -+TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY_VALUE, 4) -+TAO_NAMESPACE_END -+ -+// **************************************************************** - - // Default constructor. - CORBA_PolicyError::CORBA_PolicyError (void) -- : CORBA_UserException ("IDL:omg.org/CORBA_PolicyError:1.0") -+ : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0") - { - } - -@@ -165,22 +75,22 @@ - { - } - --void CORBA_PolicyError::_tao_any_destructor (void *_tao_void_pointer) -+void CORBA_PolicyError::_tao_any_destructor (void *x) - { -- CORBA_PolicyError *tmp = ACE_static_cast (CORBA_PolicyError*, _tao_void_pointer); -+ CORBA_PolicyError *tmp = ACE_static_cast (CORBA_PolicyError*,x); - delete tmp; - } - - // Copy constructor. --CORBA_PolicyError::CORBA_PolicyError (const ::CORBA_PolicyError &_tao_excp) -+CORBA_PolicyError::CORBA_PolicyError (const ::CORBA::PolicyError &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) - { - 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); - this->reason = _tao_excp.reason; -@@ -188,10 +98,10 @@ - } - - // Narrow. --CORBA_PolicyError * --CORBA_PolicyError::_downcast (CORBA::Exception *exc) -+CORBA::PolicyError * -+CORBA::PolicyError::_downcast (CORBA::Exception *exc) - { -- if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PolicyError:1.0", exc->_id ())) -+ if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ())) - { - return ACE_dynamic_cast (CORBA_PolicyError *, exc); - } -@@ -201,12 +111,12 @@ - } - } - --void CORBA_PolicyError::_raise () -+void CORBA::PolicyError::_raise () - { - TAO_RAISE (*this); - } - --void CORBA_PolicyError::_tao_encode ( -+void CORBA::PolicyError::_tao_encode ( - TAO_OutputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV - ) const -@@ -219,7 +129,7 @@ - ACE_THROW (CORBA::MARSHAL ()); - } - --void CORBA_PolicyError::_tao_decode ( -+void CORBA::PolicyError::_tao_decode ( - TAO_InputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV - ) -@@ -233,84 +143,25 @@ - } - - // 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::CORBA_PolicyError ( - CORBA::PolicyErrorCode _tao_reason - ) -- : CORBA_UserException ("IDL:omg.org/CORBA_PolicyError:1.0") -+ : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0") - { - 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 (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x4572726f), -- ACE_NTOHL (0x723a312e), -- ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA_PolicyError:1.0 -- 18, -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x4572726f), -- ACE_NTOHL (0x72000000), // name = CORBA_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) -- ); -- --CORBA::TypeCode_ptr _tc_CORBA_PolicyError = -- &_tc_TAO_tc_CORBA_PolicyError; -- -- - // TAO extension - the virtual _type method. --CORBA::TypeCode_ptr CORBA_PolicyError::_type (void) const -+CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const - { -- return ::_tc_CORBA_PolicyError; -+ return ::CORBA::_tc_PolicyError; - } - - -@@ -400,9 +251,9 @@ - {} - CORBA_InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) // dtor - {} --void CORBA_InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_void_pointer) -+void CORBA_InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *x) - { -- _tao_seq_UShort *tmp = ACE_static_cast (_tao_seq_UShort*, _tao_void_pointer); -+ _tao_seq_UShort *tmp = ACE_static_cast (_tao_seq_UShort*,x); - delete tmp; - } - -@@ -411,7 +262,7 @@ - - // Default constructor. - CORBA_InvalidPolicies::CORBA_InvalidPolicies (void) -- : CORBA_UserException ("IDL:omg.org/CORBA_InvalidPolicies:1.0") -+ : CORBA_UserException ("IDL:omg.org/CORBA/InvalidPolicies:1.0") - { - } - -@@ -420,9 +271,9 @@ - { - } - --void CORBA_InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer) -+void CORBA_InvalidPolicies::_tao_any_destructor (void *x) - { -- CORBA_InvalidPolicies *tmp = ACE_static_cast (CORBA_InvalidPolicies*, _tao_void_pointer); -+ CORBA_InvalidPolicies *tmp = ACE_static_cast (CORBA_InvalidPolicies*,x); - delete tmp; - } - -@@ -446,7 +297,7 @@ - CORBA_InvalidPolicies * - CORBA_InvalidPolicies::_downcast (CORBA::Exception *exc) - { -- if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_InvalidPolicies:1.0", exc->_id ())) -+ if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_id ())) - { - return ACE_dynamic_cast (CORBA_InvalidPolicies *, exc); - } -@@ -498,94 +349,48 @@ - CORBA_InvalidPolicies::CORBA_InvalidPolicies ( - const CORBA_InvalidPolicies::_tao_seq_UShort & _tao_indices - ) -- : CORBA_UserException ("IDL:omg.org/CORBA_InvalidPolicies:1.0") -+ : CORBA_UserException ("IDL:omg.org/CORBA/InvalidPolicies:1.0") - { - this->indices = _tao_indices; - } - --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 (0x415f496e), -- ACE_NTOHL (0x76616c69), -- ACE_NTOHL (0x64506f6c), -- ACE_NTOHL (0x69636965), -- ACE_NTOHL (0x733a312e), -- ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA_InvalidPolicies:1.0 -- 22, -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x415f496e), -- ACE_NTOHL (0x76616c69), -- ACE_NTOHL (0x64506f6c), -- ACE_NTOHL (0x69636965), -- ACE_NTOHL (0x73000000), // name = CORBA_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) -- ); -- --CORBA::TypeCode_ptr _tc_CORBA_InvalidPolicies = -- &_tc_TAO_tc_CORBA_InvalidPolicies; -- -- - // TAO extension - the virtual _type method. - CORBA::TypeCode_ptr CORBA_InvalidPolicies::_type (void) const - { -- return ::_tc_CORBA_InvalidPolicies; -+ return ::CORBA::_tc_InvalidPolicies; - } - --CORBA_Policy_ptr -+CORBA::Policy_ptr - tao_CORBA_Policy_duplicate ( -- CORBA_Policy_ptr p -+ CORBA::Policy_ptr p - ) - { -- return CORBA_Policy::_duplicate (p); -+ return CORBA::Policy::_duplicate (p); - } - - void - tao_CORBA_Policy_release ( -- CORBA_Policy_ptr p -+ CORBA::Policy_ptr p - ) - { - CORBA::release (p); - } - --CORBA_Policy_ptr -+CORBA::Policy_ptr - tao_CORBA_Policy_nil ( - void - ) - { -- return CORBA_Policy::_nil (); -+ return CORBA::Policy::_nil (); - } - --CORBA_Policy_ptr -+CORBA::Policy_ptr - tao_CORBA_Policy_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV - ) - { -- return CORBA_Policy::_narrow (p, ACE_TRY_ENV); -+ return CORBA::Policy::_narrow (p, ACE_TRY_ENV); - } - - CORBA::Object * -@@ -593,26 +398,26 @@ - void *src - ) - { -- CORBA_Policy **tmp = -- ACE_static_cast (CORBA_Policy **, src); -+ CORBA::Policy **tmp = -+ ACE_static_cast (CORBA::Policy **, src); - return *tmp; - } - - // ************************************************************* --// Operations for class CORBA_Policy_var -+// Operations for class CORBA::Policy_var - // ************************************************************* - - CORBA_Policy_var::CORBA_Policy_var (void) // default constructor - : ptr_ (CORBA_Policy::_nil ()) - {} - --::CORBA_Policy_ptr -+::CORBA::Policy_ptr - CORBA_Policy_var::ptr (void) const - { - return this->ptr_; - } - --CORBA_Policy_var::CORBA_Policy_var (const ::CORBA_Policy_var &p) // copy constructor -+CORBA_Policy_var::CORBA_Policy_var (const ::CORBA::Policy_var &p) // copy constructor - : TAO_Base_var (), - ptr_ (CORBA_Policy::_duplicate (p.ptr ())) - {} -@@ -622,7 +427,7 @@ - CORBA::release (this->ptr_); - } - --CORBA_Policy_var & -+CORBA::Policy_var & - CORBA_Policy_var::operator= (CORBA_Policy_ptr p) - { - CORBA::release (this->ptr_); -@@ -630,66 +435,66 @@ - return *this; - } - --CORBA_Policy_var & --CORBA_Policy_var::operator= (const ::CORBA_Policy_var &p) -+CORBA::Policy_var & -+CORBA_Policy_var::operator= (const ::CORBA::Policy_var &p) - { - if (this != &p) - { - CORBA::release (this->ptr_); -- this->ptr_ = ::CORBA_Policy::_duplicate (p.ptr ()); -+ this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ()); - } - return *this; - } - --CORBA_Policy_var::operator const ::CORBA_Policy_ptr &() const // cast -+CORBA_Policy_var::operator const ::CORBA::Policy_ptr &() const // cast - { - return this->ptr_; - } - --CORBA_Policy_var::operator ::CORBA_Policy_ptr &() // cast -+CORBA_Policy_var::operator ::CORBA::Policy_ptr &() // cast - { - return this->ptr_; - } - --::CORBA_Policy_ptr -+::CORBA::Policy_ptr - CORBA_Policy_var::operator-> (void) const - { - return this->ptr_; - } - --::CORBA_Policy_ptr -+::CORBA::Policy_ptr - CORBA_Policy_var::in (void) const - { - return this->ptr_; - } - --::CORBA_Policy_ptr & -+::CORBA::Policy_ptr & - CORBA_Policy_var::inout (void) - { - return this->ptr_; - } - --::CORBA_Policy_ptr & -+::CORBA::Policy_ptr & - CORBA_Policy_var::out (void) - { - CORBA::release (this->ptr_); -- this->ptr_ = ::CORBA_Policy::_nil (); -+ this->ptr_ = ::CORBA::Policy::_nil (); - return this->ptr_; - } - --::CORBA_Policy_ptr -+::CORBA::Policy_ptr - CORBA_Policy_var::_retn (void) - { - // yield ownership of managed obj reference -- ::CORBA_Policy_ptr val = this->ptr_; -- this->ptr_ = ::CORBA_Policy::_nil (); -+ ::CORBA::Policy_ptr val = this->ptr_; -+ this->ptr_ = ::CORBA::Policy::_nil (); - return val; - } - --::CORBA_Policy_ptr -+::CORBA::Policy_ptr - CORBA_Policy_var::duplicate (CORBA_Policy_ptr p) - { -- return ::CORBA_Policy::_duplicate (p); -+ return ::CORBA::Policy::_duplicate (p); - } - - void -@@ -698,19 +503,19 @@ - CORBA::release (p); - } - --::CORBA_Policy_ptr -+::CORBA::Policy_ptr - CORBA_Policy_var::nil (void) - { -- return ::CORBA_Policy::_nil (); -+ return ::CORBA::Policy::_nil (); - } - --::CORBA_Policy_ptr -+::CORBA::Policy_ptr - CORBA_Policy_var::narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV - ) - { -- return ::CORBA_Policy::_narrow (p, ACE_TRY_ENV); -+ return ::CORBA::Policy::_narrow (p, ACE_TRY_ENV); - } - - CORBA::Object * -@@ -722,20 +527,20 @@ - } - - // ************************************************************* --// Operations for class CORBA_Policy_out -+// Operations for class CORBA::Policy_out - // ************************************************************* - - CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_ptr &p) - : ptr_ (p) - { -- this->ptr_ = ::CORBA_Policy::_nil (); -+ this->ptr_ = ::CORBA::Policy::_nil (); - } - - CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_var &p) // constructor from _var - : ptr_ (p.out ()) - { - CORBA::release (this->ptr_); -- this->ptr_ = ::CORBA_Policy::_nil (); -+ this->ptr_ = ::CORBA::Policy::_nil (); - } - - CORBA_Policy_out::CORBA_Policy_out (const ::CORBA_Policy_out &p) // copy constructor -@@ -743,38 +548,38 @@ - {} - - ::CORBA_Policy_out & --CORBA_Policy_out::operator= (const ::CORBA_Policy_out &p) -+CORBA_Policy_out::operator= (const ::CORBA::Policy_out &p) - { - this->ptr_ = ACE_const_cast (CORBA_Policy_out&, p).ptr_; - return *this; - } - --CORBA_Policy_out & --CORBA_Policy_out::operator= (const ::CORBA_Policy_var &p) -+CORBA::Policy_out & -+CORBA_Policy_out::operator= (const ::CORBA::Policy_var &p) - { -- this->ptr_ = ::CORBA_Policy::_duplicate (p.ptr ()); -+ this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ()); - return *this; - } - --CORBA_Policy_out & -+CORBA::Policy_out & - CORBA_Policy_out::operator= (CORBA_Policy_ptr p) - { - this->ptr_ = p; - return *this; - } - --CORBA_Policy_out::operator ::CORBA_Policy_ptr &() // cast -+CORBA_Policy_out::operator ::CORBA::Policy_ptr &() // cast - { - return this->ptr_; - } - --::CORBA_Policy_ptr & -+::CORBA::Policy_ptr & - CORBA_Policy_out::ptr (void) // ptr - { - return this->ptr_; - } - --::CORBA_Policy_ptr -+::CORBA::Policy_ptr - CORBA_Policy_out::operator-> (void) - { - return this->ptr_; -@@ -903,13 +708,13 @@ - ) - ACE_THROW_SPEC ((CORBA::SystemException)); - -- void result (CORBA_Policy_ptr result); -+ void result (CORBA::Policy_ptr result); - - private: - TAO_ClientRequestInfo_CORBA_Policy_copy (const TAO_ClientRequestInfo_CORBA_Policy_copy &); - void operator= (const TAO_ClientRequestInfo_CORBA_Policy_copy &); - -- CORBA_Policy_ptr _result; -+ CORBA::Policy_ptr _result; - }; - - TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy ( -@@ -962,7 +767,7 @@ - } - - void --TAO_ClientRequestInfo_CORBA_Policy_copy::result (CORBA_Policy_ptr result) -+TAO_ClientRequestInfo_CORBA_Policy_copy::result (CORBA::Policy_ptr result) - { - // update the result - this->_result = result; -@@ -1055,16 +860,16 @@ - // Base & Remote Proxy Implementation. - // - --_TAO_CORBA_Policy_Proxy_Impl::_TAO_CORBA_Policy_Proxy_Impl (void) -+CORBA_TAO_Policy_Proxy_Impl::CORBA_TAO_Policy_Proxy_Impl (void) - {} - --_TAO_CORBA_Policy_Remote_Proxy_Impl::_TAO_CORBA_Policy_Remote_Proxy_Impl (void) -+CORBA_TAO_Policy_Remote_Proxy_Impl::CORBA_TAO_Policy_Remote_Proxy_Impl (void) - {} - - // Remote Implementation of the IDL interface methods - --CORBA::PolicyType _TAO_CORBA_Policy_Remote_Proxy_Impl::policy_type ( -- CORBA_Object *_collocated_tao_target_, -+CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type ( -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( -@@ -1151,7 +956,7 @@ - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW_RETURN ( -- CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES), -+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), - _tao_retval - ); - -@@ -1229,8 +1034,8 @@ - return _tao_retval; - } - --CORBA_Policy_ptr _TAO_CORBA_Policy_Remote_Proxy_Impl::copy ( -- CORBA_Object *_collocated_tao_target_, -+CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy ( -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( -@@ -1238,8 +1043,8 @@ - )) - { - -- CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil (); -- CORBA_Policy_var _tao_safe_retval (_tao_retval); -+ CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil (); -+ CORBA::Policy_var _tao_safe_retval (_tao_retval); - - - TAO_Stub *istub = _collocated_tao_target_->_stubobj (); -@@ -1318,7 +1123,7 @@ - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW_RETURN ( -- CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES), -+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), - 0 - ); - -@@ -1350,7 +1155,7 @@ - } - - #if TAO_HAS_INTERCEPTORS == 1 -- CORBA_Policy_ptr _tao_retval_info = _tao_safe_retval._retn (); -+ CORBA::Policy_ptr _tao_retval_info = _tao_safe_retval._retn (); - ri.result (_tao_retval_info); - _tao_safe_retval = _tao_retval_info; - -@@ -1397,8 +1202,8 @@ - return _tao_safe_retval._retn (); - } - --void _TAO_CORBA_Policy_Remote_Proxy_Impl::destroy ( -- CORBA_Object *_collocated_tao_target_, -+void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy ( -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( -@@ -1485,7 +1290,7 @@ - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW ( -- CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES) -+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) - ); - - } -@@ -1559,37 +1364,37 @@ - // Remote & Base Proxy Broker Implementation - // - --_TAO_CORBA_Policy_Proxy_Broker::_TAO_CORBA_Policy_Proxy_Broker (void) -+CORBA_TAO_Policy_Proxy_Broker::CORBA_TAO_Policy_Proxy_Broker (void) - { - } - --_TAO_CORBA_Policy_Proxy_Broker::~_TAO_CORBA_Policy_Proxy_Broker (void) -+CORBA_TAO_Policy_Proxy_Broker::~CORBA_TAO_Policy_Proxy_Broker (void) - { - } - --_TAO_CORBA_Policy_Proxy_Broker * (*_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer) ( -+CORBA_TAO_Policy_Proxy_Broker * (*CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - - // Factory Member function Implementation. --_TAO_CORBA_Policy_Remote_Proxy_Broker * --_TAO_CORBA_Policy_Remote_Proxy_Broker::the_TAO_CORBA_Policy_Remote_Proxy_Broker (void) -+CORBA_TAO_Policy_Remote_Proxy_Broker * -+CORBA_TAO_Policy_Remote_Proxy_Broker::the_CORBA_TAO_Policy_Remote_Proxy_Broker (void) - { -- static ::_TAO_CORBA_Policy_Remote_Proxy_Broker remote_proxy_broker; -+ static CORBA_TAO_Policy_Remote_Proxy_Broker remote_proxy_broker; - return &remote_proxy_broker; - } - --_TAO_CORBA_Policy_Remote_Proxy_Broker::_TAO_CORBA_Policy_Remote_Proxy_Broker (void) -+CORBA_TAO_Policy_Remote_Proxy_Broker::CORBA_TAO_Policy_Remote_Proxy_Broker (void) - { - } - --_TAO_CORBA_Policy_Remote_Proxy_Broker::~_TAO_CORBA_Policy_Remote_Proxy_Broker (void) -+CORBA_TAO_Policy_Remote_Proxy_Broker::~CORBA_TAO_Policy_Remote_Proxy_Broker (void) - { - } - --_TAO_CORBA_Policy_Proxy_Impl& --_TAO_CORBA_Policy_Remote_Proxy_Broker::select_proxy ( -- ::CORBA_Policy *, -+CORBA_TAO_Policy_Proxy_Impl& -+CORBA_TAO_Policy_Remote_Proxy_Broker::select_proxy ( -+ ::CORBA::Policy *, - CORBA::Environment & - ) - { -@@ -1616,20 +1421,20 @@ - CORBA_Policy::CORBA_Policy_setup_collocation (int collocated) - { - if (collocated) -- this->the_TAO_CORBA_Policy_Proxy_Broker_ = -- ::_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer (this); -+ this->the_CORBA_TAO_Policy_Proxy_Broker_ = -+ ::CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer (this); - else -- this->the_TAO_CORBA_Policy_Proxy_Broker_ = -- ::_TAO_CORBA_Policy_Remote_Proxy_Broker::the_TAO_CORBA_Policy_Remote_Proxy_Broker (); -+ this->the_CORBA_TAO_Policy_Proxy_Broker_ = -+ CORBA_TAO_Policy_Remote_Proxy_Broker::the_CORBA_TAO_Policy_Remote_Proxy_Broker (); - } - --void CORBA_Policy::_tao_any_destructor (void *_tao_void_pointer) -+void CORBA_Policy::_tao_any_destructor (void *x) - { -- CORBA_Policy *tmp = ACE_static_cast (CORBA_Policy*, _tao_void_pointer); -+ CORBA_Policy *tmp = ACE_static_cast (CORBA_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 - ) -@@ -1638,7 +1443,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 (); -@@ -1646,29 +1451,31 @@ - return CORBA_Policy::_unchecked_narrow (obj, ACE_TRY_ENV); - } - --CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow ( -+CORBA::Policy_ptr CORBA_Policy::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & - ) - { - if (CORBA::is_nil (obj)) - return CORBA_Policy::_nil (); -+ - if (! obj->_is_local ()) - { - TAO_Stub* stub = obj->_stubobj (); - if (stub) - stub->_incr_refcnt (); -+ - CORBA_Policy_ptr default_proxy = CORBA_Policy::_nil (); - - if ( - !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && -- obj->_is_collocated () &&_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer != 0 -+ obj->_is_collocated () &&CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer != 0 - ) - { - ACE_NEW_RETURN ( - default_proxy, -- ::CORBA_Policy ( -+ ::CORBA::Policy ( - stub, - 1, - obj->_servant ()), -@@ -1676,7 +1483,7 @@ - CORBA_Policy::_nil ()); - } - if (CORBA::is_nil (default_proxy)) -- ACE_NEW_RETURN (default_proxy, ::CORBA_Policy (stub, 0, obj->_servant ()), CORBA_Policy::_nil ()); -+ ACE_NEW_RETURN (default_proxy, ::CORBA::Policy (stub, 0, obj->_servant ()), CORBA_Policy::_nil ()); - return default_proxy; - } - else -@@ -1695,7 +1502,7 @@ - ); - } - --CORBA_Policy_ptr -+CORBA::Policy_ptr - CORBA_Policy::_duplicate (CORBA_Policy_ptr obj) - { - if (!CORBA::is_nil (obj)) -@@ -1706,14 +1513,14 @@ - 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/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); - } - --void *CORBA_Policy::_tao_QueryInterface (ptr_arith_t type) -+void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type) - { - void *retv = 0; - if (type == ACE_reinterpret_cast -@@ -1731,7 +1538,32 @@ - - const char* CORBA_Policy::_interface_repository_id (void) const - { -- return "IDL:omg.org/CORBA_Policy:1.0"; -+ return "IDL:omg.org/CORBA/Policy:1.0"; -+} -+ -+CORBA::Boolean -+CORBA_Policy::_tao_encode (TAO_OutputCDR &) -+{ -+ return 0; -+} -+ -+CORBA::Boolean -+CORBA_Policy::_tao_decode (TAO_InputCDR &) -+{ -+ return 0; -+} -+ -+TAO_Cached_Policy_Type -+CORBA_Policy::_tao_cached_type (void) const -+{ -+ // By default, all policies are uncached. -+ return TAO_CACHED_POLICY_UNCACHED; -+} -+ -+TAO_Policy_Scope -+CORBA_Policy::_tao_scope (void) const -+{ -+ return TAO_POLICY_DEFAULT_SCOPE; - } - - CORBA::PolicyType CORBA_Policy::policy_type ( -@@ -1741,8 +1573,8 @@ - CORBA::SystemException - )) - { -- _TAO_CORBA_Policy_Proxy_Impl &proxy = -- this->the_TAO_CORBA_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); -+ CORBA_TAO_Policy_Proxy_Impl &proxy = -+ this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - return proxy.policy_type ( -@@ -1751,15 +1583,15 @@ - ); - } - --CORBA_Policy_ptr CORBA_Policy::copy ( -+CORBA::Policy_ptr CORBA_Policy::copy ( - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) - { -- _TAO_CORBA_Policy_Proxy_Impl &proxy = -- this->the_TAO_CORBA_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); -+ CORBA_TAO_Policy_Proxy_Impl &proxy = -+ this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - return proxy.copy ( -@@ -1768,15 +1600,15 @@ - ); - } - --void CORBA_Policy::destroy ( -+void CORBA::Policy::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) - { -- _TAO_CORBA_Policy_Proxy_Impl &proxy = -- this->the_TAO_CORBA_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); -+ CORBA_TAO_Policy_Proxy_Impl &proxy = -+ this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); - ACE_CHECK; - - proxy.destroy ( -@@ -1785,37 +1617,6 @@ - ); - } - --static const CORBA::Long _oc_CORBA_Policy[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 29, -- ACE_NTOHL (0x49444c3a), -- ACE_NTOHL (0x6f6d672e), -- ACE_NTOHL (0x6f72672f), -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x3a312e30), -- ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA_Policy:1.0 -- 13, -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x0), // name = CORBA_Policy --}; -- --static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy ( -- CORBA::tk_objref, -- sizeof (_oc_CORBA_Policy), -- (char *) &_oc_CORBA_Policy, -- 0, -- sizeof (CORBA_Policy) -- ); -- --CORBA::TypeCode_ptr _tc_CORBA_Policy = -- &_tc_TAO_tc_CORBA_Policy; -- -- - #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - - #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_) -@@ -1825,17 +1626,17 @@ - void - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_allocate_buffer (CORBA::ULong length) - { -- CORBA_Policy **tmp = 0; -+ 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_); -+ 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]); -+ tmp[i] = CORBA::Policy::_duplicate (old[i]); - } - else - { -@@ -1856,12 +1657,12 @@ - { - if (this->buffer_ == 0 || this->release_ == 0) - return; -- CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_); -+ 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 (); -+ tmp[i] = CORBA::Policy::_nil (); - } - - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp); -@@ -1876,12 +1677,12 @@ - void - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) - { -- CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_); -+ 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 (); -+ tmp[i] = CORBA::Policy::_nil (); - } - } - -@@ -1892,15 +1693,15 @@ - CORBA_Environment &ACE_TRY_ENV - ) - { -- CORBA_Policy **tmp = ACE_static_cast (CORBA_Policy**, target); -- *tmp = CORBA_Policy::_narrow (src, ACE_TRY_ENV); -+ CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target); -+ *tmp = CORBA::Policy::_narrow (src, ACE_TRY_ENV); - ACE_CHECK; - } - - CORBA_Object* - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_upcast (void *src) const - { -- CORBA_Policy **tmp = ACE_static_cast (CORBA_Policy**, src); -+ CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, src); - return *tmp; - } - -@@ -1913,7 +1714,7 @@ - #define _CORBA_POLICYLIST_CS_ - - // ************************************************************* --// CORBA_PolicyList -+// CORBA::PolicyList - // ************************************************************* - - CORBA_PolicyList::CORBA_PolicyList (void) -@@ -1923,16 +1724,16 @@ - #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList - #else /* TAO_USE_SEQUENCE_TEMPLATES */ --TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> -+ TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var> - #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) - {} --CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA_Policy_ptr *buffer, CORBA::Boolean release) -+CORBA_PolicyList::CORBA_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<CORBA_Policy,CORBA_Policy_var> -+ TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var> - #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) - {} -@@ -1941,77 +1742,21 @@ - #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList - #else /* TAO_USE_SEQUENCE_TEMPLATES */ --TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> -+ TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var> - #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) - {} - CORBA_PolicyList::~CORBA_PolicyList (void) // dtor - {} --void CORBA_PolicyList::_tao_any_destructor (void *_tao_void_pointer) -+void CORBA_PolicyList::_tao_any_destructor (void *x) - { -- CORBA_PolicyList *tmp = ACE_static_cast (CORBA_PolicyList*, _tao_void_pointer); -+ CORBA_PolicyList *tmp = ACE_static_cast (CORBA_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 (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x4c697374), -- ACE_NTOHL (0x3a312e30), -- ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA_PolicyList:1.0 -- 17, -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x4c697374), -- ACE_NTOHL (0x0), // name = CORBA_PolicyList -- CORBA::tk_sequence, // typecode kind -- 76, // encapsulation length -- TAO_ENCAP_BYTE_ORDER, // byte order -- CORBA::tk_objref, // typecode kind -- 60, // encapsulation length -- TAO_ENCAP_BYTE_ORDER, // byte order -- 29, -- ACE_NTOHL (0x49444c3a), -- ACE_NTOHL (0x6f6d672e), -- ACE_NTOHL (0x6f72672f), -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x3a312e30), -- ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA_Policy:1.0 -- 13, -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x0), // name = CORBA_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) -- ); -- --CORBA::TypeCode_ptr _tc_CORBA_PolicyList = -- &_tc_TAO_tc_CORBA_PolicyList; -- -- - #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - - #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_) -@@ -2064,7 +1809,7 @@ - #define _CORBA_POLICYTYPESEQ_CS_ - - // ************************************************************* --// CORBA_PolicyTypeSeq -+// CORBA::PolicyTypeSeq - // ************************************************************* - - CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (void) -@@ -2098,72 +1843,15 @@ - {} - CORBA_PolicyTypeSeq::~CORBA_PolicyTypeSeq (void) // dtor - {} --void CORBA_PolicyTypeSeq::_tao_any_destructor (void *_tao_void_pointer) -+void CORBA_PolicyTypeSeq::_tao_any_destructor (void *x) - { -- CORBA_PolicyTypeSeq *tmp = ACE_static_cast (CORBA_PolicyTypeSeq*, _tao_void_pointer); -+ CORBA_PolicyTypeSeq *tmp = ACE_static_cast (CORBA_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 (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x54797065), -- ACE_NTOHL (0x5365713a), -- ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA_PolicyTypeSeq:1.0 -- 20, -- ACE_NTOHL (0x434f5242), -- ACE_NTOHL (0x415f506f), -- ACE_NTOHL (0x6c696379), -- ACE_NTOHL (0x54797065), -- ACE_NTOHL (0x53657100), // name = CORBA_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) -- ); -- --CORBA::TypeCode_ptr _tc_CORBA_PolicyTypeSeq = -- &_tc_TAO_tc_CORBA_PolicyTypeSeq; -- - CORBA_PolicyManager_ptr - tao_CORBA_PolicyManager_duplicate ( - CORBA_PolicyManager_ptr p -@@ -2404,7 +2092,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) - { -- return CORBA_PolicyManager::_unchecked_narrow (obj, ACE_TRY_ENV); -+ return CORBA::PolicyManager::_unchecked_narrow (obj, ACE_TRY_ENV); - } - - CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow ( -@@ -2414,6 +2102,7 @@ - { - if (CORBA::is_nil (obj)) - return CORBA_PolicyManager::_nil (); -+ - return - ACE_reinterpret_cast - ( -@@ -2455,320 +2144,26 @@ - - const char* CORBA_PolicyManager::_interface_repository_id (void) const - { -- return "IDL:omg.org/CORBA_PolicyManager:1.0"; --} -- --CORBA_Current_ptr --tao_CORBA_Current_duplicate ( -- CORBA_Current_ptr p -- ) --{ -- return CORBA_Current::_duplicate (p); --} -- --void --tao_CORBA_Current_release ( -- CORBA_Current_ptr p -- ) --{ -- CORBA::release (p); --} -- --CORBA_Current_ptr --tao_CORBA_Current_nil ( -- void -- ) --{ -- return CORBA_Current::_nil (); --} -- --CORBA_Current_ptr --tao_CORBA_Current_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return CORBA_Current::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_CORBA_Current_upcast ( -- void *src -- ) --{ -- CORBA_Current **tmp = -- ACE_static_cast (CORBA_Current **, src); -- return *tmp; --} -- --// ************************************************************* --// Operations for class CORBA_Current_var --// ************************************************************* -- --CORBA_Current_var::CORBA_Current_var (void) // default constructor -- : ptr_ (CORBA_Current::_nil ()) --{} -- --::CORBA_Current_ptr --CORBA_Current_var::ptr (void) const --{ -- return this->ptr_; --} -- --CORBA_Current_var::CORBA_Current_var (const ::CORBA_Current_var &p) // copy constructor -- : TAO_Base_var (), -- ptr_ (CORBA_Current::_duplicate (p.ptr ())) --{} -- --CORBA_Current_var::~CORBA_Current_var (void) // destructor --{ -- CORBA::release (this->ptr_); --} -- --CORBA_Current_var & --CORBA_Current_var::operator= (CORBA_Current_ptr p) --{ -- CORBA::release (this->ptr_); -- this->ptr_ = p; -- return *this; --} -- --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; --} -- --CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast --{ -- return this->ptr_; --} -- --CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast --{ -- return this->ptr_; --} -- --::CORBA_Current_ptr --CORBA_Current_var::operator-> (void) const --{ -- return this->ptr_; --} -- --::CORBA_Current_ptr --CORBA_Current_var::in (void) const --{ -- return this->ptr_; --} -- --::CORBA_Current_ptr & --CORBA_Current_var::inout (void) --{ -- return this->ptr_; --} -- --::CORBA_Current_ptr & --CORBA_Current_var::out (void) --{ -- CORBA::release (this->ptr_); -- this->ptr_ = ::CORBA_Current::_nil (); -- return this->ptr_; --} -- --::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; --} -- --::CORBA_Current_ptr --CORBA_Current_var::duplicate (CORBA_Current_ptr p) --{ -- return ::CORBA_Current::_duplicate (p); --} -- --void --CORBA_Current_var::release (CORBA_Current_ptr p) --{ -- CORBA::release (p); --} -- --::CORBA_Current_ptr --CORBA_Current_var::nil (void) --{ -- return ::CORBA_Current::_nil (); --} -- --::CORBA_Current_ptr --CORBA_Current_var::narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return ::CORBA_Current::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --CORBA_Current_var::upcast (void *src) --{ -- CORBA_Current **tmp = -- ACE_static_cast (CORBA_Current **, src); -- return *tmp; --} -- --// ************************************************************* --// Operations for class CORBA_Current_out --// ************************************************************* -- --CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p) -- : ptr_ (p) --{ -- this->ptr_ = ::CORBA_Current::_nil (); --} -- --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 (); --} -- --CORBA_Current_out::CORBA_Current_out (const ::CORBA_Current_out &p) // copy constructor -- : ptr_ (ACE_const_cast (CORBA_Current_out &, p).ptr_) --{} -- --::CORBA_Current_out & --CORBA_Current_out::operator= (const ::CORBA_Current_out &p) --{ -- this->ptr_ = ACE_const_cast (CORBA_Current_out&, p).ptr_; -- return *this; --} -- --CORBA_Current_out & --CORBA_Current_out::operator= (const ::CORBA_Current_var &p) --{ -- this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ()); -- return *this; --} -- --CORBA_Current_out & --CORBA_Current_out::operator= (CORBA_Current_ptr p) --{ -- this->ptr_ = p; -- return *this; --} -- --CORBA_Current_out::operator ::CORBA_Current_ptr &() // cast --{ -- return this->ptr_; --} -- --::CORBA_Current_ptr & --CORBA_Current_out::ptr (void) // ptr --{ -- return this->ptr_; --} -- --::CORBA_Current_ptr --CORBA_Current_out::operator-> (void) --{ -- return this->ptr_; --} -- -- --// default constructor --CORBA_Current::CORBA_Current () --{ -- } -- --// destructor --CORBA_Current::~CORBA_Current (void) --{} -- --CORBA_Current_ptr CORBA_Current::_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return CORBA_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 CORBA_Current::_nil (); -- return -- ACE_reinterpret_cast -- ( -- CORBA_Current_ptr, -- obj->_tao_QueryInterface -- ( -- ACE_reinterpret_cast -- ( -- ptr_arith_t, -- &CORBA_Current::_narrow -- ) -- ) -- ); --} -- --CORBA_Current_ptr --CORBA_Current::_duplicate (CORBA_Current_ptr obj) --{ -- if (!CORBA::is_nil (obj)) -- obj->_add_ref (); -- return obj; --} -- --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_PolicyCurrent_ptr -+CORBA::PolicyCurrent_ptr - tao_CORBA_PolicyCurrent_duplicate ( -- CORBA_PolicyCurrent_ptr p -+ CORBA::PolicyCurrent_ptr p - ) - { -- return CORBA_PolicyCurrent::_duplicate (p); -+ return CORBA::PolicyCurrent::_duplicate (p); - } - - void - tao_CORBA_PolicyCurrent_release ( -- CORBA_PolicyCurrent_ptr p -+ CORBA::PolicyCurrent_ptr p - ) - { - CORBA::release (p); - } - --CORBA_PolicyCurrent_ptr -+CORBA::PolicyCurrent_ptr - tao_CORBA_PolicyCurrent_nil ( - void - ) -@@ -3002,6 +2397,7 @@ - { - if (CORBA::is_nil (obj)) - return CORBA_PolicyCurrent::_nil (); -+ - return - ACE_reinterpret_cast - ( -@@ -3052,7 +2448,7 @@ - void *, - ACE_static_cast - ( -- CORBA_Current_ptr, -+ CORBA::Current_ptr, - this - ) - ); -@@ -3067,90 +2463,50 @@ - - const char* CORBA_PolicyCurrent::_interface_repository_id (void) const - { -- return "IDL:omg.org/CORBA_PolicyCurrent:1.0"; --} -- --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 () -- ); --} -- --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem) --{ -- ACE_TRY_NEW_ENV -- { -- CORBA::TypeCode_var type = _tao_any.type (); -- -- CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType, ACE_TRY_ENV); -- ACE_TRY_CHECK; -- -- if (!result) -- return 0; // not equivalent -- -- TAO_InputCDR stream ( -- _tao_any._tao_get_cdr (), -- _tao_any._tao_byte_order () -- ); -- if (stream >> _tao_elem) -- { -- return 1; -- } -- } -- ACE_CATCHANY -- { -- return 0; -- } -- ACE_ENDTRY; -- return 0; -+ return "IDL:omg.org/CORBA/PolicyCurrent:1.0"; - } - --void operator<<= (CORBA::Any &_tao_any, const CORBA_PolicyError &_tao_elem) // copying -+void operator<<= (CORBA::Any &_tao_any, const CORBA::PolicyError &_tao_elem) // copying - { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( -- _tc_CORBA_PolicyError, -+ CORBA::_tc_PolicyError, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } - --void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyError *_tao_elem) // non copying -+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyError *_tao_elem) // non copying - { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( -- _tc_CORBA_PolicyError, -+ CORBA::_tc_PolicyError, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, -- CORBA_PolicyError::_tao_any_destructor -+ CORBA::PolicyError::_tao_any_destructor - ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyError *&_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyError *&_tao_elem) - { - return _tao_any >>= ACE_const_cast( -- const CORBA_PolicyError*&, -+ const CORBA::PolicyError*&, - _tao_elem - ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyError *&_tao_elem) -+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 (); - -- CORBA::Boolean result = type->equivalent (_tc_CORBA_PolicyError, ACE_TRY_ENV); -+ CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -@@ -3158,13 +2514,13 @@ - - if (_tao_any.any_owns_data ()) - { -- _tao_elem = (CORBA_PolicyError *)_tao_any.value (); -+ _tao_elem = (CORBA::PolicyError *)_tao_any.value (); - return 1; - } - else - { -- CORBA_PolicyError *tmp; -- ACE_NEW_RETURN (tmp, CORBA_PolicyError, 0); -+ CORBA::PolicyError *tmp; -+ ACE_NEW_RETURN (tmp, CORBA::PolicyError, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () -@@ -3174,15 +2530,15 @@ - 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) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( -- _tc_CORBA_PolicyError, -+ CORBA::_tc_PolicyError, - 1, - tmp, -- CORBA_PolicyError::_tao_any_destructor -+ CORBA::PolicyError::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; -@@ -3205,7 +2561,7 @@ - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( -- _tc_CORBA_InvalidPolicies, -+ CORBA::_tc_InvalidPolicies, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -@@ -3216,7 +2572,7 @@ - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( -- _tc_CORBA_InvalidPolicies, -+ CORBA::_tc_InvalidPolicies, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, -@@ -3240,7 +2596,7 @@ - { - CORBA::TypeCode_var type = _tao_any.type (); - -- CORBA::Boolean result = type->equivalent (_tc_CORBA_InvalidPolicies, ACE_TRY_ENV); -+ CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -@@ -3264,12 +2620,12 @@ - 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) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( -- _tc_CORBA_InvalidPolicies, -+ CORBA::_tc_InvalidPolicies, - 1, - tmp, - CORBA_InvalidPolicies::_tao_any_destructor -@@ -3290,30 +2646,30 @@ - return 0; - } - --void operator<<= (CORBA::Any &_tao_any, CORBA_Policy_ptr _tao_elem) -+void operator<<= (CORBA::Any &_tao_any, CORBA::Policy_ptr _tao_elem) - { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( -- _tc_CORBA_Policy, -+ CORBA::_tc_Policy, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, -- CORBA_Policy::_duplicate (_tao_elem), -- CORBA_Policy::_tao_any_destructor -+ CORBA::Policy::_duplicate (_tao_elem), -+ CORBA::Policy::_tao_any_destructor - ); - } - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Policy_ptr &_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_elem) - { - ACE_TRY_NEW_ENV - { -- _tao_elem = CORBA_Policy::_nil (); -+ _tao_elem = CORBA::Policy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - -- CORBA::Boolean result = type->equivalent (_tc_CORBA_Policy, ACE_TRY_ENV); -+ CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -@@ -3326,77 +2682,77 @@ - if (stream >> _tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( -- _tc_CORBA_Policy, -+ CORBA::_tc_Policy, - 1, - _tao_elem, -- CORBA_Policy::_tao_any_destructor -+ CORBA::Policy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { -- _tao_elem = CORBA_Policy::_nil (); -+ _tao_elem = CORBA::Policy::_nil (); - return 0; - } - ACE_ENDTRY; -- _tao_elem = CORBA_Policy::_nil (); -+ _tao_elem = CORBA::Policy::_nil (); - return 0; - } - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -- template class TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>; -+ template class TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -- # pragma instantiate TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var> -+ # pragma instantiate TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - void operator<<= ( - CORBA::Any &_tao_any, -- const CORBA_PolicyList &_tao_elem -+ const CORBA::PolicyList &_tao_elem - ) // copying - { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( -- _tc_CORBA_PolicyList, -+ CORBA::_tc_PolicyList, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } - } - --void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyList *_tao_elem) // non copying -+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyList *_tao_elem) // non copying - { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( -- _tc_CORBA_PolicyList, -+ CORBA::_tc_PolicyList, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, -- CORBA_PolicyList::_tao_any_destructor -+ CORBA::PolicyList::_tao_any_destructor - ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyList *&_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyList *&_tao_elem) - { - return _tao_any >>= ACE_const_cast( -- const CORBA_PolicyList*&, -+ const CORBA::PolicyList*&, - _tao_elem - ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyList *&_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList *&_tao_elem) - { - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - -- CORBA::Boolean result = type->equivalent (_tc_CORBA_PolicyList, ACE_TRY_ENV); -+ CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -@@ -3405,15 +2761,15 @@ - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( -- const CORBA_PolicyList*, -+ const CORBA::PolicyList*, - _tao_any.value () - ); - return 1; - } - else - { -- CORBA_PolicyList *tmp; -- ACE_NEW_RETURN (tmp, CORBA_PolicyList, 0); -+ CORBA::PolicyList *tmp; -+ ACE_NEW_RETURN (tmp, CORBA::PolicyList, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () -@@ -3421,10 +2777,10 @@ - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( -- _tc_CORBA_PolicyList, -+ CORBA::_tc_PolicyList, - 1, - ACE_static_cast (void *, tmp), -- CORBA_PolicyList::_tao_any_destructor -+ CORBA::PolicyList::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; -@@ -3444,50 +2800,50 @@ - - void operator<<= ( - CORBA::Any &_tao_any, -- const CORBA_PolicyTypeSeq &_tao_elem -+ const CORBA::PolicyTypeSeq &_tao_elem - ) // copying - { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( -- _tc_CORBA_PolicyTypeSeq, -+ CORBA::_tc_PolicyTypeSeq, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } - } - --void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyTypeSeq *_tao_elem) // non copying -+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *_tao_elem) // non copying - { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( -- _tc_CORBA_PolicyTypeSeq, -+ CORBA::_tc_PolicyTypeSeq, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, -- CORBA_PolicyTypeSeq::_tao_any_destructor -+ CORBA::PolicyTypeSeq::_tao_any_destructor - ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyTypeSeq *&_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *&_tao_elem) - { - return _tao_any >>= ACE_const_cast( -- const CORBA_PolicyTypeSeq*&, -+ const CORBA::PolicyTypeSeq*&, - _tao_elem - ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, 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 (); - -- CORBA::Boolean result = type->equivalent (_tc_CORBA_PolicyTypeSeq, ACE_TRY_ENV); -+ CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -@@ -3496,15 +2852,15 @@ - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( -- const CORBA_PolicyTypeSeq*, -+ const CORBA::PolicyTypeSeq*, - _tao_any.value () - ); - return 1; - } - else - { -- CORBA_PolicyTypeSeq *tmp; -- ACE_NEW_RETURN (tmp, CORBA_PolicyTypeSeq, 0); -+ CORBA::PolicyTypeSeq *tmp; -+ ACE_NEW_RETURN (tmp, CORBA::PolicyTypeSeq, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () -@@ -3512,10 +2868,10 @@ - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( -- _tc_CORBA_PolicyTypeSeq, -+ CORBA::_tc_PolicyTypeSeq, - 1, - ACE_static_cast (void *, tmp), -- CORBA_PolicyTypeSeq::_tao_any_destructor -+ CORBA::PolicyTypeSeq::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; -@@ -3533,6 +2889,46 @@ - return 0; - } - -+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 () -+ ); -+} -+ -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem) -+{ -+ ACE_TRY_NEW_ENV -+ { -+ CORBA::TypeCode_var type = _tao_any.type (); -+ -+ CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType, ACE_TRY_ENV); -+ ACE_TRY_CHECK; -+ -+ if (!result) -+ return 0; // not equivalent -+ -+ TAO_InputCDR stream ( -+ _tao_any._tao_get_cdr (), -+ _tao_any._tao_byte_order () -+ ); -+ if (stream >> _tao_elem) -+ { -+ return 1; -+ } -+ } -+ ACE_CATCHANY -+ { -+ return 0; -+ } -+ ACE_ENDTRY; -+ return 0; -+} -+ - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_PolicyManager,CORBA_PolicyManager_var>; -@@ -3542,13 +2938,6 @@ - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -- template class TAO_Object_Manager<CORBA_Current,CORBA_Current_var>; -- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -- # pragma instantiate TAO_Object_Manager<CORBA_Current,CORBA_Current_var> --#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -- --#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ -- defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var> -@@ -3599,7 +2988,7 @@ - - CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, -- const CORBA_Policy_ptr _tao_objref -+ const CORBA::Policy_ptr _tao_objref - ) - { - CORBA::Object_ptr _tao_corba_obj = _tao_objref; -@@ -3608,7 +2997,7 @@ - - CORBA::Boolean operator>> ( - TAO_InputCDR &strm, -- CORBA_Policy_ptr &_tao_objref -+ CORBA::Policy_ptr &_tao_objref - ) - { - ACE_TRY_NEW_ENV -@@ -3618,7 +3007,7 @@ - return 0; - // narrow to the right type - _tao_objref = -- CORBA_Policy::_unchecked_narrow ( -+ CORBA::Policy::_unchecked_narrow ( - obj.in (), - ACE_TRY_ENV - ); -@@ -3635,7 +3024,7 @@ - - CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, -- const CORBA_PolicyList &_tao_sequence -+ const CORBA::PolicyList &_tao_sequence - ) - { - if (strm << _tao_sequence.length ()) -@@ -3653,7 +3042,7 @@ - - CORBA::Boolean operator>> ( - TAO_InputCDR &strm, -- CORBA_PolicyList &_tao_sequence -+ CORBA::PolicyList &_tao_sequence - ) - { - CORBA::ULong _tao_seq_len; -@@ -3682,7 +3071,7 @@ - - CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, -- const CORBA_PolicyTypeSeq &_tao_sequence -+ const CORBA::PolicyTypeSeq &_tao_sequence - ) - { - if (strm << _tao_sequence.length ()) -@@ -3695,7 +3084,7 @@ - - CORBA::Boolean operator>> ( - TAO_InputCDR &strm, -- CORBA_PolicyTypeSeq &_tao_sequence -+ CORBA::PolicyTypeSeq &_tao_sequence - ) - { - CORBA::ULong _tao_seq_len; -@@ -3716,4 +3105,3 @@ - } - return 0; // error - } -- diff --git a/TAO/tao/diffs/PolicyC.h.diff b/TAO/tao/diffs/PolicyC.h.diff deleted file mode 100644 index a710a18922f..00000000000 --- a/TAO/tao/diffs/PolicyC.h.diff +++ /dev/null @@ -1,1141 +0,0 @@ ---- orig/PolicyC.h Tue Jun 12 17:22:53 2001 -+++ PolicyC.h Tue Jun 12 13:58:13 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,13 +23,20 @@ - #define _TAO_IDL_ORIG_POLICYC_H_ - - #include "ace/pre.h" --#include "tao/corba.h" -+ -+#include "TAO_Export.h" - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - --#include "tao/corbafwd.h" -+#include "Encodable.h" -+#include "Exception.h" -+#include "Environment.h" -+#include "Sequence.h" -+#include "CDR.h" -+#include "Remote_Object_Proxy_Impl.h" -+#include "CurrentC.h" - - #if defined (TAO_EXPORT_MACRO) - #undef TAO_EXPORT_MACRO -@@ -54,30 +61,6 @@ - #pragma option push -w-rvl -w-rch -w-ccc -w-inl - #endif /* __BORLANDC__ */ - --TAO_NAMESPACE CORBA --{ -- typedef CORBA::Short PolicyErrorCode; -- typedef CORBA::Short_out PolicyErrorCode_out; -- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyErrorCode; -- -- typedef CORBA::ULong PolicyType; -- typedef CORBA::ULong_out PolicyType_out; -- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyType; -- -- enum SetOverrideType -- { -- SET_OVERRIDE, -- ADD_OVERRIDE -- }; -- -- typedef SetOverrideType &SetOverrideType_out; -- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SetOverrideType; -- -- --} --TAO_NAMESPACE_CLOSE // module CORBA -- -- - #if !defined (_CORBA_POLICYERROR_CH_) - #define _CORBA_POLICYERROR_CH_ - -@@ -120,9 +103,7 @@ - // = TAO extension. - static CORBA::Exception *_alloc (void); - virtual CORBA::TypeCode_ptr _type (void) const; --}; // Exception CORBA_PolicyError. -- --extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_PolicyError; -+ }; // Exception CORBA::PolicyError. - - - #endif /* end #if !defined */ -@@ -140,46 +121,36 @@ - #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_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); -+ -+ _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, -+ _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); -- -+ 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); -- -- // Implement the TAO_Base_Sequence methods (see Sequence.h) - 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, -+ void replace (CORBA::ULong max, - CORBA::ULong length, - CORBA::UShort *data, -- CORBA::Boolean release -- ); -+ CORBA::Boolean release); - }; - - #endif /* end #if !defined */ -@@ -191,6 +162,7 @@ - #define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_ - - class _tao_seq_UShort; -+ class _tao_seq_UShort_var; - - // ************************************************************* - // _tao_seq_UShort -@@ -216,11 +188,14 @@ - ~_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 */ - -- - #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_UShort _indices_seq; - #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ -@@ -261,23 +236,11 @@ - // = TAO extension. - static CORBA::Exception *_alloc (void); - virtual CORBA::TypeCode_ptr _type (void) const; --}; // Exception CORBA_InvalidPolicies. -- --extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_InvalidPolicies; -+ }; // Exception CORBA::InvalidPolicies. - - - #endif /* end #if !defined */ - -- --#if !defined (_CORBA_POLICY___PTR_CH_) --#define _CORBA_POLICY___PTR_CH_ -- --class CORBA_Policy; --typedef CORBA_Policy *CORBA_Policy_ptr; -- --#endif /* end #if !defined */ -- -- - #if !defined (_CORBA_POLICY___VAR_CH_) - #define _CORBA_POLICY___VAR_CH_ - -@@ -307,10 +270,7 @@ - static CORBA_Policy_ptr duplicate (CORBA_Policy_ptr); - static void release (CORBA_Policy_ptr); - static CORBA_Policy_ptr nil (void); -- static CORBA_Policy_ptr narrow ( -- CORBA::Object *, -- CORBA::Environment & -- ); -+ static CORBA_Policy_ptr narrow (CORBA::Object *, CORBA::Environment &); - static CORBA::Object * upcast (void *); - - private: -@@ -352,13 +312,14 @@ - #define _CORBA_POLICY_CH_ - - // Forward Classes Declaration --class _TAO_CORBA_Policy_Proxy_Impl; --class _TAO_CORBA_Policy_Remote_Proxy_Impl; --class _TAO_CORBA_Policy_Proxy_Broker; --class _TAO_CORBA_Policy_Remote_Proxy_Broker; -+ class CORBA_TAO_Policy_Proxy_Impl; -+ class CORBA_TAO_Policy_Remote_Proxy_Impl; -+ class CORBA_TAO_Policy_Proxy_Broker; -+ class CORBA_TAO_Policy_Remote_Proxy_Broker; - - class TAO_Export CORBA_Policy -- : public virtual CORBA_Object -+ : public virtual CORBA_Object, -+ public virtual TAO_Encodable - { - public: - #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -@@ -368,19 +329,16 @@ - - // the static operations - static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj); -- - static CORBA_Policy_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- - static CORBA_Policy_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- - static CORBA_Policy_ptr _nil (void) - { - return (CORBA_Policy_ptr)0; -@@ -396,7 +354,7 @@ - CORBA::SystemException - )); - -- virtual CORBA_Policy_ptr copy ( -+ virtual CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) -@@ -417,17 +375,26 @@ - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - -+ virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &); -+ virtual CORBA::Boolean _tao_decode (TAO_InputCDR &); -+ -+ // Return the cached policy type for this policy. See orbconf.h. -+ virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; -+ -+ // Returns the scope at which this policy can be applied. See orbconf.h. -+ virtual TAO_Policy_Scope _tao_scope (void) const; -+ - private: -- _TAO_CORBA_Policy_Proxy_Broker *the_TAO_CORBA_Policy_Proxy_Broker_; -+ CORBA_TAO_Policy_Proxy_Broker *the_CORBA_TAO_Policy_Proxy_Broker_; - - protected: - CORBA_Policy (int collocated = 0); - -+ protected: - // This methods travese the inheritance tree and set the - // parents piece of the given class in the right mode - virtual void CORBA_Policy_setup_collocation (int collocated); -@@ -438,41 +405,41 @@ - TAO_Abstract_ServantBase *servant = 0 - ); - -- friend class _TAO_CORBA_Policy_Remote_Proxy_Impl; -- friend class _TAO_CORBA_Policy_ThruPOA_Proxy_Impl; -- friend class _TAO_CORBA_Policy_Direct_Proxy_Impl; -+ friend class CORBA_TAO_Policy_Remote_Proxy_Impl; -+ friend class CORBA_TAO_Policy_ThruPOA_Proxy_Impl; -+ friend class CORBA_TAO_Policy_Direct_Proxy_Impl; - - virtual ~CORBA_Policy (void); -- - private: - CORBA_Policy (const CORBA_Policy &); - void operator= (const CORBA_Policy &); - }; - -+ - // The Proxy Implementations are used by each interface to - // perform a call. Each different implementation encapsulate - // an invocation logics. - - - /////////////////////////////////////////////////////////////////////// --// Base Proxy Impl. Declaration -+ // Base Impl. Declaration - // - --class TAO_Export _TAO_CORBA_Policy_Proxy_Impl -- : public virtual TAO_Object_Proxy_Impl -+ class TAO_Export CORBA_TAO_Policy_Proxy_Impl : public virtual TAO_Object_Proxy_Impl - { - public: -- virtual ~_TAO_CORBA_Policy_Proxy_Impl (void) { } -+ virtual ~CORBA_TAO_Policy_Proxy_Impl (void) { } -+ - virtual CORBA::PolicyType policy_type ( -- CORBA_Object *_collocated_tao_target_, -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - -- virtual CORBA_Policy_ptr copy ( -- CORBA_Object *_collocated_tao_target_, -+ virtual CORBA::Policy_ptr copy ( -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( -@@ -480,45 +447,45 @@ - )) = 0; - - virtual void destroy ( -- CORBA_Object *_collocated_tao_target_, -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - -- - protected: -- _TAO_CORBA_Policy_Proxy_Impl (void); --}; -+ CORBA_TAO_Policy_Proxy_Impl (void); - -+ }; - // --// End Base Proxy Impl. Declaration -+ // Base Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////// --// Remote Proxy Impl. Declaration -+// Remote Impl. Declaration - // - --class TAO_Export _TAO_CORBA_Policy_Remote_Proxy_Impl -- : public virtual _TAO_CORBA_Policy_Proxy_Impl, -+class TAO_Export CORBA_TAO_Policy_Remote_Proxy_Impl : -+ public virtual CORBA_TAO_Policy_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl - { - public: -- _TAO_CORBA_Policy_Remote_Proxy_Impl (void); -+ CORBA_TAO_Policy_Remote_Proxy_Impl (void); -+ -+ virtual ~CORBA_TAO_Policy_Remote_Proxy_Impl (void) { } - -- virtual ~_TAO_CORBA_Policy_Remote_Proxy_Impl (void) { } - virtual CORBA::PolicyType policy_type ( -- CORBA_Object *_collocated_tao_target_, -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -- virtual CORBA_Policy_ptr copy ( -- CORBA_Object *_collocated_tao_target_, -+virtual CORBA::Policy_ptr copy ( -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( -@@ -526,41 +493,42 @@ - )); - - virtual void destroy ( -- CORBA_Object *_collocated_tao_target_, -+ CORBA::Object_ptr _collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -- - }; - - // --// End Remote Proxy Impl. Declaration -+// Base Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - -+ - // The Proxy Brokers are used by each interface to get - // the right proxy for performing a call. In the new - // collocation scheme, the proxy to be used can vary on - // a call by call basis. - - -+ - /////////////////////////////////////////////////////////////////////// - // Base Proxy Broker Declaration - // - --class TAO_Export _TAO_CORBA_Policy_Proxy_Broker -+class TAO_Export CORBA_TAO_Policy_Proxy_Broker - { - public: -- virtual ~_TAO_CORBA_Policy_Proxy_Broker (void); -- virtual _TAO_CORBA_Policy_Proxy_Impl &select_proxy ( -+ virtual ~CORBA_TAO_Policy_Proxy_Broker (void); -+ virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( - CORBA_Policy *object, -- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () -+ CORBA_Environment &ACE_TRY_ENV - ) = 0; - - protected: -- _TAO_CORBA_Policy_Proxy_Broker (void); -+ CORBA_TAO_Policy_Proxy_Broker (void); - - }; - -@@ -573,29 +541,29 @@ - // Remote Proxy Broker Declaration - // - --class TAO_Export _TAO_CORBA_Policy_Remote_Proxy_Broker -- : public virtual _TAO_CORBA_Policy_Proxy_Broker -+class TAO_Export CORBA_TAO_Policy_Remote_Proxy_Broker : public virtual CORBA_TAO_Policy_Proxy_Broker - { - public: -- _TAO_CORBA_Policy_Remote_Proxy_Broker (void); -+ CORBA_TAO_Policy_Remote_Proxy_Broker (void); - -- virtual ~_TAO_CORBA_Policy_Remote_Proxy_Broker (void); -+ virtual ~CORBA_TAO_Policy_Remote_Proxy_Broker (void); - -- virtual _TAO_CORBA_Policy_Proxy_Impl &select_proxy ( -+ virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( - CORBA_Policy *object, - CORBA_Environment &ACE_TRY_ENV - ); - - private: -- _TAO_CORBA_Policy_Remote_Proxy_Impl remote_proxy_impl_; -- --public: -+ CORBA_TAO_Policy_Remote_Proxy_Impl remote_proxy_impl_; - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. -- static _TAO_CORBA_Policy_Remote_Proxy_Broker *the_TAO_CORBA_Policy_Remote_Proxy_Broker (void); -+ -+public: -+ static CORBA_TAO_Policy_Remote_Proxy_Broker *the_CORBA_TAO_Policy_Remote_Proxy_Broker (void); - }; - -+ - // - // End Remote Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// -@@ -603,52 +571,35 @@ - - #endif /* end #if !defined */ - --extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_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 -+ 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, -+ _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum, - CORBA::ULong length, - CORBA_Policy* *value, -- CORBA::Boolean release = 0 -- ); -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList ( -- const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs -- ); -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &operator= ( -- const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs -- ); -+ 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); -- -- // = Accessors. -- TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var> operator[] (CORBA::ULong index) const; -- -- // = Static operations. -+ _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs); -+ TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> operator[] (CORBA::ULong index) const; - static CORBA_Policy **allocbuf (CORBA::ULong nelems); - static void freebuf (CORBA_Policy **buffer); -- -- // Implement the TAO_Base_Sequence methods (see Sequence.h) -+ // The Base_Sequence functions, please see tao/Sequence.h - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - CORBA_Policy* *get_buffer (CORBA::Boolean orphan = 0); - const CORBA_Policy* *get_buffer (void) const; -- virtual void _shrink_buffer ( -- CORBA::ULong nl, -- CORBA::ULong ol -- ); -- -+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol); - virtual void _downcast ( - void* target, - CORBA_Object *src, -@@ -656,6 +607,7 @@ - TAO_default_environment () - ); - virtual CORBA_Object* _upcast (void *src) const; -+ - }; - - #endif /* end #if !defined */ -@@ -666,11 +618,8 @@ - #if !defined (_CORBA_POLICYLIST_CH_) - #define _CORBA_POLICYLIST_CH_ - --class CORBA_PolicyList; --class CORBA_PolicyList_var; -- - // ************************************************************* --// CORBA_PolicyList -+// PolicyList - // ************************************************************* - - class TAO_Export CORBA_PolicyList : public -@@ -697,7 +646,6 @@ - typedef CORBA_PolicyList_var _var_type; - #endif /* ! __GNUC__ || g++ >= 2.8 */ - -- - }; - - #endif /* end #if !defined */ -@@ -707,16 +655,16 @@ - #define _CORBA_POLICYLIST___VAR_CH_ - - // ************************************************************* --// class CORBA_PolicyList_var -+// class CORBA::PolicyList_var - // ************************************************************* - - class TAO_Export CORBA_PolicyList_var - { - public: -- CORBA_PolicyList_var (void); -+ CORBA_PolicyList_var (void); // default constructor - CORBA_PolicyList_var (CORBA_PolicyList *); -- CORBA_PolicyList_var (const CORBA_PolicyList_var &); -- ~CORBA_PolicyList_var (void); -+ 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 &); -@@ -763,61 +711,49 @@ - - private: - CORBA_PolicyList *&ptr_; -- // Assignment from T_var not allowed. -+ // assignment from T_var not allowed - void operator= (const CORBA_PolicyList_var &); - }; - - - #endif /* end #if !defined */ - --extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_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 -+ 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); -+ -+ _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void); // Default constructor. - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum); -- _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); -- -+ 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); -- -- // Implement the TAO_Base_Sequence methods (see Sequence.h) - 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, -+ void replace (CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *data, -- CORBA::Boolean release -- ); -+ CORBA::Boolean release); - }; - - #endif /* end #if !defined */ -@@ -832,7 +768,7 @@ - class CORBA_PolicyTypeSeq_var; - - // ************************************************************* --// CORBA_PolicyTypeSeq -+// PolicyTypeSeq - // ************************************************************* - - class TAO_Export CORBA_PolicyTypeSeq : public -@@ -859,7 +795,6 @@ - typedef CORBA_PolicyTypeSeq_var _var_type; - #endif /* ! __GNUC__ || g++ >= 2.8 */ - -- - }; - - #endif /* end #if !defined */ -@@ -869,23 +804,21 @@ - #define _CORBA_POLICYTYPESEQ___VAR_CH_ - - // ************************************************************* --// class CORBA_PolicyTypeSeq_var -+// class CORBA::PolicyTypeSeq_var - // ************************************************************* - - class TAO_Export CORBA_PolicyTypeSeq_var - { - public: -- CORBA_PolicyTypeSeq_var (void); -+ CORBA_PolicyTypeSeq_var (void); // default constructor - CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *); -- CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &); -- // Fixed-size base types only. -- CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq &); -- ~CORBA_PolicyTypeSeq_var (void); -+ CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &); // copy constructor -+ CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq &); // fixed-size base types only -+ ~CORBA_PolicyTypeSeq_var (void); // destructor - - CORBA_PolicyTypeSeq_var &operator= (CORBA_PolicyTypeSeq *); - CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq_var &); -- // Fixed-size base types only. -- CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq &); -+ CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq &); // fixed-size base types only - CORBA_PolicyTypeSeq *operator-> (void); - const CORBA_PolicyTypeSeq *operator-> (void) const; - -@@ -929,24 +862,13 @@ - - private: - CORBA_PolicyTypeSeq *&ptr_; -- // Assignment from T_var not allowed. -+ // assignment from T_var not allowed - void operator= (const CORBA_PolicyTypeSeq_var &); - }; - - - #endif /* end #if !defined */ - --extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_PolicyTypeSeq; -- -- --#if !defined (_CORBA_POLICYMANAGER___PTR_CH_) --#define _CORBA_POLICYMANAGER___PTR_CH_ -- --class CORBA_PolicyManager; --typedef CORBA_PolicyManager *CORBA_PolicyManager_ptr; -- --#endif /* end #if !defined */ -- - - #if !defined (_CORBA_POLICYMANAGER___VAR_CH_) - #define _CORBA_POLICYMANAGER___VAR_CH_ -@@ -977,10 +899,7 @@ - static CORBA_PolicyManager_ptr duplicate (CORBA_PolicyManager_ptr); - static void release (CORBA_PolicyManager_ptr); - static CORBA_PolicyManager_ptr nil (void); -- static CORBA_PolicyManager_ptr narrow ( -- CORBA::Object *, -- CORBA::Environment & -- ); -+ static CORBA_PolicyManager_ptr narrow (CORBA::Object *, CORBA::Environment &); - static CORBA::Object * upcast (void *); - - private: -@@ -1021,8 +940,7 @@ - #if !defined (_CORBA_POLICYMANAGER_CH_) - #define _CORBA_POLICYMANAGER_CH_ - --class TAO_Export CORBA_PolicyManager -- : public virtual CORBA_Object -+class TAO_Export CORBA_PolicyManager : public virtual CORBA::Object - { - public: - #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -@@ -1032,26 +950,23 @@ - - // the static operations - 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 _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- - static CORBA_PolicyManager_ptr _nil (void) - { - return (CORBA_PolicyManager_ptr)0; - } - -- virtual CORBA_PolicyList * get_policy_overrides ( -- const CORBA_PolicyTypeSeq & ts, -+ virtual CORBA::PolicyList * get_policy_overrides ( -+ const CORBA::PolicyTypeSeq & ts, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) -@@ -1060,14 +975,14 @@ - )) = 0; - - virtual void set_policy_overrides ( -- const CORBA_PolicyList & policies, -+ const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -- CORBA_InvalidPolicies -+ CORBA::InvalidPolicies - )) = 0; - - virtual void *_tao_QueryInterface (ptr_arith_t type); -@@ -1078,7 +993,6 @@ - CORBA_PolicyManager (); - - virtual ~CORBA_PolicyManager (void); -- - private: - CORBA_PolicyManager (const CORBA_PolicyManager &); - void operator= (const CORBA_PolicyManager &); -@@ -1088,144 +1002,6 @@ - #endif /* end #if !defined */ - - --#if !defined (_CORBA_CURRENT___PTR_CH_) --#define _CORBA_CURRENT___PTR_CH_ -- --class CORBA_Current; --typedef CORBA_Current *CORBA_Current_ptr; -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_CURRENT___VAR_CH_) --#define _CORBA_CURRENT___VAR_CH_ -- --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 -- -- CORBA_Current_var &operator= (CORBA_Current_ptr); -- CORBA_Current_var &operator= (const CORBA_Current_var &); -- CORBA_Current_ptr operator-> (void) const; -- -- operator const CORBA_Current_ptr &() const; -- operator CORBA_Current_ptr &(); -- // in, inout, out, _retn -- 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; -- -- // Hooks used by template sequence and object manager classes -- // for non-defined forward declared interfaces. -- static CORBA_Current_ptr duplicate (CORBA_Current_ptr); -- static void release (CORBA_Current_ptr); -- static CORBA_Current_ptr nil (void); -- static CORBA_Current_ptr narrow ( -- CORBA::Object *, -- CORBA::Environment & -- ); -- static CORBA::Object * upcast (void *); -- --private: -- 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); --}; -- -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_CURRENT___OUT_CH_) --#define _CORBA_CURRENT___OUT_CH_ -- --class TAO_Export CORBA_Current_out --{ --public: -- 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: -- CORBA_Current_ptr &ptr_; --}; -- -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_CURRENT_CH_) --#define _CORBA_CURRENT_CH_ -- --class TAO_Export CORBA_Current -- : public virtual CORBA_Object --{ --public: --#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef CORBA_Current_ptr _ptr_type; -- typedef CORBA_Current_var _var_type; --#endif /* ! __GNUC__ || g++ >= 2.8 */ -- -- // the static operations -- 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 CORBA_Current_ptr _unchecked_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- -- static CORBA_Current_ptr _nil (void) -- { -- return (CORBA_Current_ptr)0; -- } -- -- virtual void *_tao_QueryInterface (ptr_arith_t type); -- -- virtual const char* _interface_repository_id (void) const; -- --protected: -- CORBA_Current (); -- -- virtual ~CORBA_Current (void); -- --private: -- CORBA_Current (const CORBA_Current &); -- void operator= (const CORBA_Current &); --}; -- -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICYCURRENT___PTR_CH_) --#define _CORBA_POLICYCURRENT___PTR_CH_ -- --class CORBA_PolicyCurrent; --typedef CORBA_PolicyCurrent *CORBA_PolicyCurrent_ptr; -- --#endif /* end #if !defined */ -- -- - #if !defined (_CORBA_POLICYCURRENT___VAR_CH_) - #define _CORBA_POLICYCURRENT___VAR_CH_ - -@@ -1255,10 +1031,7 @@ - static CORBA_PolicyCurrent_ptr duplicate (CORBA_PolicyCurrent_ptr); - static void release (CORBA_PolicyCurrent_ptr); - static CORBA_PolicyCurrent_ptr nil (void); -- static CORBA_PolicyCurrent_ptr narrow ( -- CORBA::Object *, -- CORBA::Environment & -- ); -+ static CORBA_PolicyCurrent_ptr narrow (CORBA::Object *, CORBA::Environment &); - static CORBA::Object * upcast (void *); - - private: -@@ -1299,9 +1072,7 @@ - #if !defined (_CORBA_POLICYCURRENT_CH_) - #define _CORBA_POLICYCURRENT_CH_ - --class TAO_Export CORBA_PolicyCurrent -- : public virtual CORBA_PolicyManager, -- public virtual CORBA_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) -@@ -1311,19 +1082,16 @@ - - // the static operations - 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 _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- - static CORBA_PolicyCurrent_ptr _nil (void) - { - return (CORBA_PolicyCurrent_ptr)0; -@@ -1337,7 +1105,6 @@ - CORBA_PolicyCurrent (); - - virtual ~CORBA_PolicyCurrent (void); -- - private: - CORBA_PolicyCurrent (const CORBA_PolicyCurrent &); - void operator= (const CORBA_PolicyCurrent &); -@@ -1346,74 +1113,73 @@ - - #endif /* end #if !defined */ - -+ - // Proxy Broker Factory function pointer declarations. - - extern TAO_Export --_TAO_CORBA_Policy_Proxy_Broker * --(*_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer) ( -+CORBA_TAO_Policy_Proxy_Broker * -+(*CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ); - -+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 *&); -+// 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 &); --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 *&); --// 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 *&); - - #ifndef __ACE_INLINE__ - --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_PolicyError &); --TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PolicyError &); -+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &); -+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyError &); - --TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InvalidPolicies &); --TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InvalidPolicies &); -+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 & -+ const CORBA::InvalidPolicies::_tao_seq_UShort & - ); - TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, -- CORBA_InvalidPolicies::_tao_seq_UShort & -+ CORBA::InvalidPolicies::_tao_seq_UShort & - ); - - #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ */ - - --TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Policy_ptr ); --TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Policy_ptr &); -+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 & -+ const CORBA::PolicyList & - ); - TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, -- CORBA_PolicyList & -+ CORBA::PolicyList & - ); - - #endif /* _TAO_CDR_OP_CORBA_PolicyList_H_ */ -@@ -1424,21 +1190,23 @@ - - TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, -- const CORBA_PolicyTypeSeq & -+ const CORBA::PolicyTypeSeq & - ); - TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, -- CORBA_PolicyTypeSeq & -+ 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_InputCDR &, CORBA::SetOverrideType &); - - #endif /* __ACE_INLINE__ */ - - - #if defined (__ACE_INLINE__) --#include "PolicyC.i" -+#include "tao/PolicyC.i" - #endif /* defined INLINE */ - - #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/diffs/PolicyC.i.diff b/TAO/tao/diffs/PolicyC.i.diff deleted file mode 100644 index 2e0a0797da3..00000000000 --- a/TAO/tao/diffs/PolicyC.i.diff +++ /dev/null @@ -1,542 +0,0 @@ ---- orig/PolicyC.i Tue Jun 12 17:22:53 2001 -+++ PolicyC.i Thu Jun 7 00:04:48 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -20,11 +20,11 @@ - // http://www.cs.wustl.edu/~schmidt/TAO.html - - // ************************************************************* --// Inline operations for exception CORBA_PolicyError -+// Inline operations for exception CORBA::PolicyError - // ************************************************************* - - // ************************************************************* --// Inline operations for exception CORBA_InvalidPolicies -+// Inline operations for exception CORBA::InvalidPolicies - // ************************************************************* - - -@@ -35,7 +35,7 @@ - - // = Static operations. - ACE_INLINE CORBA::UShort * --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size) -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - CORBA::UShort *retval = 0; -@@ -43,25 +43,25 @@ - return retval; - } - --ACE_INLINE void CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer) -+ ACE_INLINE void CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Default constructor. -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Default constructor. - { - } - - ACE_INLINE --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) // Constructor using a maximum length value. -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (maximum)) - { - } - - ACE_INLINE --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum, -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum, - CORBA::ULong length, - CORBA::UShort *data, - CORBA::Boolean release) -@@ -70,7 +70,7 @@ - } - - ACE_INLINE --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs) -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { -@@ -90,8 +90,8 @@ - } - } - --ACE_INLINE CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort & --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs) -+ ACE_INLINE CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort & -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs) - // Assignment operator. - { - if (this == &rhs) -@@ -123,7 +123,7 @@ - - // = Accessors. - ACE_INLINE CORBA::UShort & --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) - // operator [] - { - ACE_ASSERT (i < this->maximum_); -@@ -132,7 +132,7 @@ - } - - ACE_INLINE const CORBA::UShort & --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const - // operator [] - { - ACE_ASSERT (i < this->maximum_); -@@ -143,7 +143,7 @@ - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - ACE_INLINE CORBA::UShort * --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan) -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan) - { - CORBA::UShort *result = 0; - if (orphan == 0) -@@ -177,13 +177,13 @@ - } - - ACE_INLINE const CORBA::UShort * --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const - { - return ACE_reinterpret_cast(const CORBA::UShort * ACE_CAST_CONST, this->buffer_); - } - - ACE_INLINE void --CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (CORBA::ULong max, -+ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (CORBA::ULong max, - CORBA::ULong length, - CORBA::UShort *data, - CORBA::Boolean release) -@@ -227,23 +227,23 @@ - #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_) - #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_ - --ACE_INLINE CORBA_Policy ** -+ ACE_INLINE CORBA::Policy ** - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong nelems) - { -- CORBA_Policy **buf = 0; -+ CORBA::Policy **buf = 0; - -- ACE_NEW_RETURN (buf, CORBA_Policy*[nelems], 0); -+ ACE_NEW_RETURN (buf, CORBA::Policy*[nelems], 0); - - for (CORBA::ULong i = 0; i < nelems; i++) - { -- buf[i] = CORBA_Policy::_nil (); -+ buf[i] = CORBA::Policy::_nil (); - } - - return buf; - } - - ACE_INLINE void --_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA_Policy **buffer) -+ _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA::Policy **buffer) - { - if (buffer == 0) - return; -@@ -264,7 +264,7 @@ - ACE_INLINE - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum, - CORBA::ULong length, -- CORBA_Policy* *value, -+ CORBA::Policy* *value, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, value, release) - { -@@ -276,12 +276,12 @@ - { - if (rhs.buffer_ != 0) - { -- CORBA_Policy **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_); -- CORBA_Policy ** const tmp2 = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, rhs.buffer_); -+ CORBA::Policy **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_); -+ CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { -- tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]); -+ tmp1[i] = CORBA::Policy::_duplicate (tmp2[i]); - } - - this->buffer_ = tmp1; -@@ -300,12 +300,12 @@ - - if (this->release_) - { -- CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy **, this->buffer_); -+ 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 (); -+ tmp[i] = CORBA::Policy::_nil (); - } - if (this->maximum_ < rhs.maximum_) - { -@@ -318,30 +318,30 @@ - - TAO_Unbounded_Base_Sequence::operator= (rhs); - -- CORBA_Policy **tmp1 = ACE_reinterpret_cast (CORBA_Policy **, this->buffer_); -- CORBA_Policy ** const tmp2 = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, rhs.buffer_); -+ CORBA::Policy **tmp1 = ACE_reinterpret_cast (CORBA::Policy **, this->buffer_); -+ CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { -- tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]); -+ tmp1[i] = CORBA::Policy::_duplicate (tmp2[i]); - } - - return *this; - } - --ACE_INLINE TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var> -+ ACE_INLINE TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator[] (CORBA::ULong index) const - // read-write accessor - { - ACE_ASSERT (index < this->maximum_); -- CORBA_Policy ** const tmp = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, this->buffer_); -- return TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var> (tmp + index, this->release_); -+ CORBA::Policy ** const tmp = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_); -+ return TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> (tmp + index, this->release_); - } - --ACE_INLINE CORBA_Policy* * -+ ACE_INLINE CORBA::Policy* * - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (CORBA::Boolean orphan) - { -- CORBA_Policy **result = 0; -+ CORBA::Policy **result = 0; - if (orphan == 0) - { - // We retain ownership. -@@ -353,7 +353,7 @@ - } - else - { -- result = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_); -+ result = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); - } - } - else // if (orphan == 1) -@@ -362,7 +362,7 @@ - { - // We set the state back to default and relinquish - // ownership. -- result = ACE_reinterpret_cast(CORBA_Policy**,this->buffer_); -+ result = ACE_reinterpret_cast(CORBA::Policy**,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; -@@ -372,10 +372,10 @@ - return result; - } - --ACE_INLINE const CORBA_Policy* * -+ ACE_INLINE const CORBA::Policy* * - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (void) const - { -- return ACE_reinterpret_cast(const CORBA_Policy ** ACE_CAST_CONST, this->buffer_); -+ return ACE_reinterpret_cast(const CORBA::Policy ** ACE_CAST_CONST, this->buffer_); - } - - -@@ -489,7 +489,7 @@ - return this->ptr_; - } - --ACE_INLINE TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> -+ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var> - CORBA_PolicyList_var::operator[] (CORBA::ULong index) - { - return this->ptr_->operator[] (index); -@@ -586,7 +586,7 @@ - return this->ptr_; - } - --ACE_INLINE TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> -+ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var> - CORBA_PolicyList_out::operator[] (CORBA::ULong index) - { - return this->ptr_->operator[] (index); -@@ -776,7 +776,7 @@ - #define _CORBA_POLICYTYPESEQ_CI_ - - // ************************************************************* --// Inline operations for class CORBA_PolicyTypeSeq_var -+// Inline operations for class CORBA::PolicyTypeSeq_var - // ************************************************************* - - ACE_INLINE -@@ -790,17 +790,17 @@ - {} - - ACE_INLINE --CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const ::CORBA_PolicyTypeSeq_var &p) // copy constructor -+CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &p) // copy constructor - { - if (p.ptr_) -- ACE_NEW (this->ptr_, ::CORBA_PolicyTypeSeq (*p.ptr_)); -+ ACE_NEW (this->ptr_, CORBA_PolicyTypeSeq (*p.ptr_)); - else - this->ptr_ = 0; - } - - // fixed-size base types only - ACE_INLINE --CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const ::CORBA_PolicyTypeSeq &p) -+CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq &p) - { - ACE_NEW (this->ptr_, ::CORBA_PolicyTypeSeq (p)); - } -@@ -849,42 +849,42 @@ - - // fixed-size types only - ACE_INLINE ::CORBA_PolicyTypeSeq_var & --CORBA_PolicyTypeSeq_var::operator= (const ::CORBA_PolicyTypeSeq &p) -+CORBA_PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq &p) - { - if (this->ptr_ != &p) - { - delete this->ptr_; -- ACE_NEW_RETURN (this->ptr_, ::CORBA_PolicyTypeSeq (p), *this); -+ ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this); - } - return *this; - } - --ACE_INLINE const ::CORBA_PolicyTypeSeq * -+ACE_INLINE const ::CORBA::PolicyTypeSeq * - CORBA_PolicyTypeSeq_var::operator-> (void) const - { - return this->ptr_; - } - --ACE_INLINE ::CORBA_PolicyTypeSeq * -+ACE_INLINE ::CORBA::PolicyTypeSeq * - CORBA_PolicyTypeSeq_var::operator-> (void) - { - return this->ptr_; - } - - ACE_INLINE --CORBA_PolicyTypeSeq_var::operator const ::CORBA_PolicyTypeSeq &() const // cast -+CORBA_PolicyTypeSeq_var::operator const ::CORBA::PolicyTypeSeq &() const // cast - { - return *this->ptr_; - } - - ACE_INLINE --CORBA_PolicyTypeSeq_var::operator ::CORBA_PolicyTypeSeq &() // cast -+CORBA_PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() // cast - { - return *this->ptr_; - } - - ACE_INLINE --CORBA_PolicyTypeSeq_var::operator ::CORBA_PolicyTypeSeq &() const // cast -+CORBA_PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() const // cast - { - return *this->ptr_; - } -@@ -901,20 +901,20 @@ - return ACE_const_cast (const CORBA::PolicyType &, this->ptr_->operator[] (index)); - } - --ACE_INLINE const ::CORBA_PolicyTypeSeq & -+ACE_INLINE const ::CORBA::PolicyTypeSeq & - CORBA_PolicyTypeSeq_var::in (void) const - { - return *this->ptr_; - } - --ACE_INLINE ::CORBA_PolicyTypeSeq & -+ACE_INLINE ::CORBA::PolicyTypeSeq & - CORBA_PolicyTypeSeq_var::inout (void) - { - return *this->ptr_; - } - - // mapping for variable size --ACE_INLINE ::CORBA_PolicyTypeSeq *& -+ACE_INLINE ::CORBA::PolicyTypeSeq *& - CORBA_PolicyTypeSeq_var::out (void) - { - delete this->ptr_; -@@ -922,15 +922,15 @@ - return this->ptr_; - } - --ACE_INLINE ::CORBA_PolicyTypeSeq * -+ACE_INLINE ::CORBA::PolicyTypeSeq * - CORBA_PolicyTypeSeq_var::_retn (void) - { -- ::CORBA_PolicyTypeSeq *tmp = this->ptr_; -+ ::CORBA::PolicyTypeSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; - } - --ACE_INLINE ::CORBA_PolicyTypeSeq * -+ACE_INLINE ::CORBA::PolicyTypeSeq * - CORBA_PolicyTypeSeq_var::ptr (void) const - { - return this->ptr_; -@@ -975,18 +975,18 @@ - } - - ACE_INLINE --CORBA_PolicyTypeSeq_out::operator ::CORBA_PolicyTypeSeq *&() // cast -+CORBA_PolicyTypeSeq_out::operator ::CORBA::PolicyTypeSeq *&() // cast - { - return this->ptr_; - } - --ACE_INLINE ::CORBA_PolicyTypeSeq *& -+ACE_INLINE ::CORBA::PolicyTypeSeq *& - CORBA_PolicyTypeSeq_out::ptr (void) // ptr - { - return this->ptr_; - } - --ACE_INLINE ::CORBA_PolicyTypeSeq * -+ACE_INLINE ::CORBA::PolicyTypeSeq * - CORBA_PolicyTypeSeq_out::operator-> (void) - { - return this->ptr_; -@@ -1022,26 +1022,7 @@ - - #endif /* end #if !defined */ - --ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval) --{ -- CORBA::ULong _tao_temp = _tao_enumval; -- return strm << _tao_temp; --} -- --ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval) --{ -- CORBA::ULong _tao_temp = 0; -- CORBA::Boolean _tao_result = strm >> _tao_temp; -- -- if (_tao_result == 1) -- { -- _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp); -- } -- -- return _tao_result; --} -- --ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PolicyError &_tao_aggregate) -+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PolicyError &_tao_aggregate) - { - // first marshal the repository ID - if (strm << _tao_aggregate._id ()) -@@ -1058,7 +1039,7 @@ - return 0; - } - --ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA_PolicyError &_tao_aggregate) -+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA::PolicyError &_tao_aggregate) - { - // now marshal the members - if ( -@@ -1075,16 +1056,16 @@ - - CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, -- const CORBA_InvalidPolicies::_tao_seq_UShort & -+ const CORBA::InvalidPolicies::_tao_seq_UShort & - ); - CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, -- CORBA_InvalidPolicies::_tao_seq_UShort & -+ CORBA::InvalidPolicies::_tao_seq_UShort & - ); - - #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_ */ - --ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_InvalidPolicies &_tao_aggregate) -+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InvalidPolicies &_tao_aggregate) - { - // first marshal the repository ID - if (strm << _tao_aggregate._id ()) -@@ -1101,7 +1082,7 @@ - return 0; - } - --ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA_InvalidPolicies &_tao_aggregate) -+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA::InvalidPolicies &_tao_aggregate) - { - // now marshal the members - if ( -@@ -1114,12 +1095,12 @@ - - TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, -- const CORBA_Policy_ptr -+ const CORBA::Policy_ptr - ); - - TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, -- CORBA_Policy_ptr & -+ CORBA::Policy_ptr & - ); - - -@@ -1143,12 +1124,30 @@ - - CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, -- const CORBA_PolicyTypeSeq & -+ const CORBA::PolicyTypeSeq & - ); - CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, -- CORBA_PolicyTypeSeq & -+ CORBA::PolicyTypeSeq & - ); - - #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ */ - -+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval) -+{ -+ CORBA::ULong _tao_temp = _tao_enumval; -+ return strm << _tao_temp; -+} -+ -+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval) -+{ -+ CORBA::ULong _tao_temp = 0; -+ CORBA::Boolean _tao_result = strm >> _tao_temp; -+ -+ if (_tao_result == 1) -+ { -+ _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp); -+ } -+ -+ return _tao_result; -+} diff --git a/TAO/tao/diffs/PolicyS.cpp.diff b/TAO/tao/diffs/PolicyS.cpp.diff deleted file mode 100644 index e69de29bb2d..00000000000 --- a/TAO/tao/diffs/PolicyS.cpp.diff +++ /dev/null diff --git a/TAO/tao/diffs/PolicyS.h.diff b/TAO/tao/diffs/PolicyS.h.diff deleted file mode 100644 index fa5fb24e86e..00000000000 --- a/TAO/tao/diffs/PolicyS.h.diff +++ /dev/null @@ -1,288 +0,0 @@ ---- orig/PolicyS.h Tue Jun 12 17:22:53 2001 -+++ PolicyS.h Fri Dec 15 14:06:49 2000 -@@ -1,268 +1,23 @@ --// -*- C++ -*- --// --// $Id$ -- --// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** --// TAO and the TAO IDL Compiler have been developed by: --// Center for Distributed Object Computing --// Washington University --// St. Louis, MO --// USA --// http://www.cs.wustl.edu/~schmidt/doc-center.html --// and --// Distributed Object Computing Laboratory --// University of California at Irvine --// Irvine, CA --// USA --// http://doc.ece.uci.edu/ --// --// Information about TAO is available at: --// http://www.cs.wustl.edu/~schmidt/TAO.html -- --#ifndef _TAO_IDL_ORIG_POLICYS_H_ --#define _TAO_IDL_ORIG_POLICYS_H_ -- --#include "ace/pre.h" --#include "PolicyC.h" -- -+/* -*- C++ -*- $Id$ */ -+//============================================================================= -+/** -+ * @file PolicyS.h -+ * -+ * $Id$ -+ * -+ * The file is almost empty and only present to keep other IDL files -+ * that include Policy.pidl happy. -+ * -+ */ -+//============================================================================= -+ -+#ifndef TAO_PIDL_POLICY_S_H -+#define TAO_PIDL_POLICY_S_H -+#include "tao/PolicyC.h" - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - --#include "tao/PortableServer/PortableServer.h" --#include "tao/PortableServer/Servant_Base.h" --#include "tao/PortableServer/Collocated_Object.h" --#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h" --#include "tao/PortableServer/Direct_Object_Proxy_Impl.h" --#if defined(_MSC_VER) --#if (_MSC_VER >= 1200) --#pragma warning(push) --#endif /* _MSC_VER >= 1200 */ --#pragma warning(disable:4250) --#endif /* _MSC_VER */ -- --#if defined (__BORLANDC__) --#pragma option push -w-rvl -w-rch -w-ccc -w-inl --#endif /* __BORLANDC__ */ -- --TAO_NAMESPACE POA_CORBA --{ --} --TAO_NAMESPACE_CLOSE // module CORBA -- --class POA_CORBA_Policy; --typedef POA_CORBA_Policy *POA_CORBA_Policy_ptr; --// Forward Classes Declaration --class _TAO_CORBA_Policy_ThruPOA_Proxy_Impl; --class _TAO_CORBA_Policy_Strategized_Proxy_Broker; -- --class TAO_Export POA_CORBA_Policy : public virtual PortableServer::ServantBase --{ --protected: -- POA_CORBA_Policy (void); -- --public: -- POA_CORBA_Policy (const POA_CORBA_Policy& rhs); -- virtual ~POA_CORBA_Policy (void); -- -- -- virtual CORBA::Boolean _is_a ( -- const char* logical_type_id, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- -- virtual void* _downcast ( -- const char* logical_type_id -- ); -- -- static void _is_a_skel ( -- TAO_ServerRequest &req, -- void *obj, -- void *servant_upcall, -- CORBA::Environment &ACE_TRY_ENV -- ); -- -- static void _non_existent_skel ( -- TAO_ServerRequest &req, -- void *obj, -- void *servant_upcall, -- CORBA::Environment &ACE_TRY_ENV -- ); -- -- static void _interface_skel ( -- TAO_ServerRequest &req, -- void *obj, -- void *servant_upcall, -- CORBA::Environment &ACE_TRY_ENV -- ); -- -- virtual void _dispatch ( -- TAO_ServerRequest &req, -- void *_servant_upcall, -- CORBA::Environment &ACE_TRY_ENV -- ); -- -- ::CORBA_Policy *_this ( -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- -- virtual const char* _interface_repository_id (void) const; -- -- virtual CORBA::PolicyType policy_type ( -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )) = 0; -- -- static void _get_policy_type_skel ( -- TAO_ServerRequest &_tao_req, -- void *_tao_obj, -- void *_tao_servant_upcall, -- CORBA::Environment &ACE_TRY_ENV -- ); -- -- virtual CORBA_Policy_ptr copy ( -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )) = 0; -- -- static void copy_skel ( -- TAO_ServerRequest &_tao_req, -- void *_tao_obj, -- void *_tao_servant_upcall, -- CORBA::Environment &ACE_TRY_ENV -- ); -- -- virtual void destroy ( -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )) = 0; -- -- static void destroy_skel ( -- TAO_ServerRequest &_tao_req, -- void *_tao_obj, -- void *_tao_servant_upcall, -- CORBA::Environment &ACE_TRY_ENV -- ); -- -- --}; -- -- --/////////////////////////////////////////////////////////////////////// --// Strategized Proxy Broker Declaration --// -- --class TAO_Export _TAO_CORBA_Policy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Policy_Proxy_Broker --{ --public: -- _TAO_CORBA_Policy_Strategized_Proxy_Broker (void); -- -- virtual ~_TAO_CORBA_Policy_Strategized_Proxy_Broker (void); -- -- virtual ::_TAO_CORBA_Policy_Proxy_Impl &select_proxy ( -- ::CORBA_Policy *object, -- CORBA_Environment &ACE_TRY_ENV -- ); -- --private: -- // Helper methods that takes care to create the proxy -- // as soon as their use is necessary. -- void create_proxy ( -- int collocation_strategy, -- CORBA::Environment &ACE_TRY_ENV -- ); -- -- // Caches the proxy implementations. The proxy implementation -- // are totally stateless, and those can be shared by all the -- // instances of a given IDL interface type. -- ::_TAO_CORBA_Policy_Proxy_Impl -- *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; -- -- TAO_SYNCH_MUTEX mutex_; -- // This funxtion is used to get an handle to the unique instance -- // of the Strategized Proxy Broker that is available for a given -- // interface. -- --public: -- static _TAO_CORBA_Policy_Strategized_Proxy_Broker *the_TAO_CORBA_Policy_Strategized_Proxy_Broker (void); --}; -- -- --// --// End Strategized Proxy Broker Declaration --/////////////////////////////////////////////////////////////////////// -- -- --/////////////////////////////////////////////////////////////////////// --// ThruPOA Impl. Declaration --// -- --class TAO_Export _TAO_CORBA_Policy_ThruPOA_Proxy_Impl : -- public virtual ::_TAO_CORBA_Policy_Proxy_Impl, -- public virtual TAO_ThruPOA_Object_Proxy_Impl --{ --public: -- _TAO_CORBA_Policy_ThruPOA_Proxy_Impl (void); -- -- virtual ~_TAO_CORBA_Policy_ThruPOA_Proxy_Impl (void) { } -- -- virtual CORBA::PolicyType policy_type ( -- CORBA_Object *_collocated_tao_target_, -- CORBA::Environment &ACE_TRY_ENV -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )); -- -- virtual CORBA_Policy_ptr copy ( -- CORBA_Object *_collocated_tao_target_, -- CORBA::Environment &ACE_TRY_ENV -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )); -- -- virtual void destroy ( -- CORBA_Object *_collocated_tao_target_, -- CORBA::Environment &ACE_TRY_ENV -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )); -- -- --}; -- --// --// ThruPOA Proxy Impl. Declaration --/////////////////////////////////////////////////////////////////////// -- -- --#include "PolicyS_T.h" -- --#if defined (__ACE_INLINE__) --#include "PolicyS.i" --#endif /* defined INLINE */ -- --#if defined(_MSC_VER) && (_MSC_VER >= 1200) --#pragma warning(pop) --#endif /* _MSC_VER */ -- --#if defined (__BORLANDC__) --#pragma option pop --#endif /* __BORLANDC__ */ - --#include "ace/post.h" --#endif /* ifndef */ -+#endif /* TAO_PIDL_POLICY_S_H*/ diff --git a/TAO/tao/diffs/PolicyS.i.diff b/TAO/tao/diffs/PolicyS.i.diff deleted file mode 100644 index e69de29bb2d..00000000000 --- a/TAO/tao/diffs/PolicyS.i.diff +++ /dev/null diff --git a/TAO/tao/diffs/PolicyS_T.cpp.diff b/TAO/tao/diffs/PolicyS_T.cpp.diff deleted file mode 100644 index e69de29bb2d..00000000000 --- a/TAO/tao/diffs/PolicyS_T.cpp.diff +++ /dev/null diff --git a/TAO/tao/diffs/PolicyS_T.h.diff b/TAO/tao/diffs/PolicyS_T.h.diff deleted file mode 100644 index e69de29bb2d..00000000000 --- a/TAO/tao/diffs/PolicyS_T.h.diff +++ /dev/null diff --git a/TAO/tao/diffs/PolicyS_T.i.diff b/TAO/tao/diffs/PolicyS_T.i.diff deleted file mode 100644 index e69de29bb2d..00000000000 --- a/TAO/tao/diffs/PolicyS_T.i.diff +++ /dev/null diff --git a/TAO/tao/diffs/Policy_Forward.diff b/TAO/tao/diffs/Policy_Forward.diff new file mode 100644 index 00000000000..d2e029cf315 --- /dev/null +++ b/TAO/tao/diffs/Policy_Forward.diff @@ -0,0 +1,18 @@ +--- orig/Policy_ForwardC.h Wed Feb 6 19:23:32 2002 ++++ Policy_ForwardC.h Wed Feb 6 19:23:58 2002 +@@ -23,13 +23,14 @@ + #define _TAO_IDL_ORIG_POLICY_FORWARDC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + + #include "TAO_Export.h" ++#include "Sequence.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/diffs/Pollable.diff b/TAO/tao/diffs/Pollable.diff new file mode 100644 index 00000000000..f326e46cd7e --- /dev/null +++ b/TAO/tao/diffs/Pollable.diff @@ -0,0 +1,45 @@ +--- orig/PollableC.h Tue Feb 5 15:23:35 2002 ++++ PollableC.h Tue Feb 5 15:26:57 2002 +@@ -23,13 +23,16 @@ + #define _TAO_IDL_ORIG_POLLABLEC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + ++#if (TAO_HAS_AMI_POLLER == 1) + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + + #include "TAO_Export.h" ++#include "Exception.h" ++#include "Object.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +@@ -676,6 +679,8 @@ + #if defined (__BORLANDC__) + #pragma option pop + #endif /* __BORLANDC__ */ ++ ++#endif /* TAO_HAS_AMI_POLLER == 1 */ + + #include "ace/post.h" + #endif /* ifndef */ +--- orig/PollableC.cpp Tue Feb 5 15:23:35 2002 ++++ PollableC.cpp Tue Feb 5 15:26:06 2002 +@@ -21,6 +21,8 @@ + + #include "PollableC.h" + ++#if (TAO_HAS_AMI_POLLER == 1) ++ + #include "tao/Stub.h" + #include "tao/Invocation.h" + #include "tao/PortableInterceptor.h" +@@ -1131,3 +1133,4 @@ + # pragma instantiate TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ++#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/diffs/PollableC.cpp.diff b/TAO/tao/diffs/PollableC.cpp.diff deleted file mode 100644 index e2dd641dbf3..00000000000 --- a/TAO/tao/diffs/PollableC.cpp.diff +++ /dev/null @@ -1,236 +0,0 @@ ---- orig/PollableC.cpp Tue Apr 24 23:49:07 2001 -+++ PollableC.cpp Tue Apr 24 13:44:41 2001 -@@ -1,6 +1,6 @@ --// -*- C++ -*- -+// -*- C++ -*- $Id$ */ - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -21,63 +21,17 @@ - - #include "PollableC.h" - -+#if (TAO_HAS_AMI_POLLER == 1) -+ - #include "tao/Stub.h" - #include "tao/Invocation.h" --#include "tao/ClientRequestInfo.h" --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -- --#if defined (__BORLANDC__) --#pragma option -w-rvl -w-rch -w-ccc -w-aus --#endif /* __BORLANDC__ */ -+#include "tao/Any.h" - - #if !defined (__ACE_INLINE__) - #include "PollableC.i" - #endif /* !defined INLINE */ - --CORBA_Pollable_ptr --tao_CORBA_Pollable_duplicate ( -- CORBA_Pollable_ptr p -- ) --{ -- return CORBA_Pollable::_duplicate (p); --} -- --void --tao_CORBA_Pollable_release ( -- CORBA_Pollable_ptr p -- ) --{ -- CORBA::release (p); --} -- --CORBA_Pollable_ptr --tao_CORBA_Pollable_nil ( -- void -- ) --{ -- return CORBA_Pollable::_nil (); --} -- --CORBA_Pollable_ptr --tao_CORBA_Pollable_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return CORBA_Pollable::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_CORBA_Pollable_upcast ( -- void *src -- ) --{ -- CORBA_Pollable **tmp = -- ACE_static_cast (CORBA_Pollable **, src); -- return *tmp; --} -+ACE_RCSID(tao, PollableC, "$Id$") - - // ************************************************************* - // Operations for class CORBA_Pollable_var -@@ -201,7 +155,6 @@ - ACE_static_cast (CORBA_Pollable **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class CORBA_Pollable_out - // ************************************************************* -@@ -327,50 +280,7 @@ - - const char* CORBA_Pollable::_interface_repository_id (void) const - { -- return "IDL:omg.org/CORBA_Pollable:1.0"; --} -- --CORBA_DIIPollable_ptr --tao_CORBA_DIIPollable_duplicate ( -- CORBA_DIIPollable_ptr p -- ) --{ -- return CORBA_DIIPollable::_duplicate (p); --} -- --void --tao_CORBA_DIIPollable_release ( -- CORBA_DIIPollable_ptr p -- ) --{ -- CORBA::release (p); --} -- --CORBA_DIIPollable_ptr --tao_CORBA_DIIPollable_nil ( -- void -- ) --{ -- return CORBA_DIIPollable::_nil (); --} -- --CORBA_DIIPollable_ptr --tao_CORBA_DIIPollable_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return CORBA_DIIPollable::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_CORBA_DIIPollable_upcast ( -- void *src -- ) --{ -- CORBA_DIIPollable **tmp = -- ACE_static_cast (CORBA_DIIPollable **, src); -- return *tmp; -+ return "IDL:omg.org/CORBA/Pollable:1.0"; - } - - // ************************************************************* -@@ -495,7 +405,6 @@ - ACE_static_cast (CORBA_DIIPollable **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class CORBA_DIIPollable_out - // ************************************************************* -@@ -633,50 +542,7 @@ - - const char* CORBA_DIIPollable::_interface_repository_id (void) const - { -- return "IDL:omg.org/CORBA_DIIPollable:1.0"; --} -- --CORBA_PollableSet_ptr --tao_CORBA_PollableSet_duplicate ( -- CORBA_PollableSet_ptr p -- ) --{ -- return CORBA_PollableSet::_duplicate (p); --} -- --void --tao_CORBA_PollableSet_release ( -- CORBA_PollableSet_ptr p -- ) --{ -- CORBA::release (p); --} -- --CORBA_PollableSet_ptr --tao_CORBA_PollableSet_nil ( -- void -- ) --{ -- return CORBA_PollableSet::_nil (); --} -- --CORBA_PollableSet_ptr --tao_CORBA_PollableSet_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return CORBA_PollableSet::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_CORBA_PollableSet_upcast ( -- void *src -- ) --{ -- CORBA_PollableSet **tmp = -- ACE_static_cast (CORBA_PollableSet **, src); -- return *tmp; -+ return "IDL:omg.org/CORBA/DIIPollable:1.0"; - } - - // ************************************************************* -@@ -801,7 +667,6 @@ - ACE_static_cast (CORBA_PollableSet **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class CORBA_PollableSet_out - // ************************************************************* -@@ -990,7 +855,7 @@ - ACE_THROW (CORBA::MARSHAL ()); - } - --// TAO extension - the _alloc method. -+// TAO extension - the _alloc method - CORBA::Exception *CORBA_PollableSet::NoPossiblePollable::_alloc (void) - { - CORBA::Exception *retval = 0; -@@ -1044,12 +909,12 @@ - - void CORBA_PollableSet::UnknownPollable::_tao_encode ( - TAO_OutputCDR &, -- CORBA::Environment &ACE_TRY_ENV -- ) const -+ CORBA::Environment &ACE_TRY_ENV) const - { - ACE_THROW (CORBA::MARSHAL ()); - } - -+ - void CORBA_PollableSet::UnknownPollable::_tao_decode ( - TAO_InputCDR &, - CORBA::Environment &ACE_TRY_ENV -@@ -1087,3 +952,4 @@ - # pragma instantiate TAO_Object_Manager<CORBA_PollableSet,CORBA_PollableSet_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -+#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/diffs/PollableC.h.diff b/TAO/tao/diffs/PollableC.h.diff deleted file mode 100644 index 34d481426e3..00000000000 --- a/TAO/tao/diffs/PollableC.h.diff +++ /dev/null @@ -1,90 +0,0 @@ ---- orig/PollableC.h Tue Apr 24 23:49:07 2001 -+++ PollableC.h Tue Apr 24 16:43:49 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -19,17 +19,22 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#ifndef _TAO_IDL_POLLABLEC_H_ --#define _TAO_IDL_POLLABLEC_H_ -- -+#ifndef _TAO_IDL_TMP_POLLABLEC_H_ -+#define _TAO_IDL_TMP_POLLABLEC_H_ - #include "ace/pre.h" --#include "tao/corba.h" -+ -+#include "tao/corbafwd.h" -+ -+#if (TAO_HAS_AMI_POLLER == 1) -+ -+#include "tao/Object.h" -+#include "tao/Exception.h" -+#include "tao/CDR.h" - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - --#include "tao/corbafwd.h" - - #if defined (TAO_EXPORT_MACRO) - #undef TAO_EXPORT_MACRO -@@ -257,7 +262,7 @@ - virtual const char* _interface_repository_id (void) const; - - protected: -- CORBA_Pollable (); -+ CORBA_Pollable (void); - - virtual ~CORBA_Pollable (void); - private: -@@ -378,7 +383,7 @@ - virtual const char* _interface_repository_id (void) const; - - protected: -- CORBA_DIIPollable (); -+ CORBA_DIIPollable (void); - - virtual ~CORBA_DIIPollable (void); - private: -@@ -390,6 +395,15 @@ - #endif /* end #if !defined */ - - -+#if !defined (_CORBA_POLLABLESET___PTR_CH_) -+#define _CORBA_POLLABLESET___PTR_CH_ -+ -+class CORBA_PollableSet; -+typedef CORBA_PollableSet *CORBA_PollableSet_ptr; -+ -+#endif /* end #if !defined */ -+ -+ - #if !defined (_CORBA_POLLABLESET_CH_) - #define _CORBA_POLLABLESET_CH_ - -@@ -550,7 +564,7 @@ - virtual const char* _interface_repository_id (void) const; - - protected: -- CORBA_PollableSet (); -+ CORBA_PollableSet (void); - - virtual ~CORBA_PollableSet (void); - private: -@@ -579,6 +593,8 @@ - #if defined (__BORLANDC__) - #pragma option pop - #endif /* __BORLANDC__ */ -+ -+#endif /* TAO_HAS_AMI_POLLER == 1 */ - - #include "ace/post.h" - #endif /* ifndef */ diff --git a/TAO/tao/diffs/PollableC.i.diff b/TAO/tao/diffs/PollableC.i.diff deleted file mode 100644 index 065ef4ff02a..00000000000 --- a/TAO/tao/diffs/PollableC.i.diff +++ /dev/null @@ -1,164 +0,0 @@ ---- orig/PollableC.i Tue Apr 24 23:49:07 2001 -+++ PollableC.i Tue Apr 24 13:44:41 2001 -@@ -1,6 +1,6 @@ --// -*- C++ -*- -+// -*- C++ -*- $Id$ */ - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,6 +23,49 @@ - #if !defined (_CORBA_POLLABLE___CI_) - #define _CORBA_POLLABLE___CI_ - -+ACE_INLINE CORBA_Pollable_ptr -+tao_CORBA_Pollable_duplicate ( -+ CORBA_Pollable_ptr p -+ ) -+{ -+ return CORBA_Pollable::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_CORBA_Pollable_release ( -+ CORBA_Pollable_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE CORBA_Pollable_ptr -+tao_CORBA_Pollable_nil ( -+ void -+ ) -+{ -+ return CORBA_Pollable::_nil (); -+} -+ -+ACE_INLINE CORBA_Pollable_ptr -+tao_CORBA_Pollable_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return CORBA_Pollable::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_CORBA_Pollable_upcast ( -+ void *src -+ ) -+{ -+ CORBA_Pollable **tmp = -+ ACE_static_cast (CORBA_Pollable **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -30,6 +73,49 @@ - #if !defined (_CORBA_DIIPOLLABLE___CI_) - #define _CORBA_DIIPOLLABLE___CI_ - -+ACE_INLINE CORBA_DIIPollable_ptr -+tao_CORBA_DIIPollable_duplicate ( -+ CORBA_DIIPollable_ptr p -+ ) -+{ -+ return CORBA_DIIPollable::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_CORBA_DIIPollable_release ( -+ CORBA_DIIPollable_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE CORBA_DIIPollable_ptr -+tao_CORBA_DIIPollable_nil ( -+ void -+ ) -+{ -+ return CORBA_DIIPollable::_nil (); -+} -+ -+ACE_INLINE CORBA_DIIPollable_ptr -+tao_CORBA_DIIPollable_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return CORBA_DIIPollable::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_CORBA_DIIPollable_upcast ( -+ void *src -+ ) -+{ -+ CORBA_DIIPollable **tmp = -+ ACE_static_cast (CORBA_DIIPollable **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -41,9 +127,51 @@ - // Inline operations for exception CORBA_PollableSet::UnknownPollable - // ************************************************************* - -- - #if !defined (_CORBA_POLLABLESET___CI_) - #define _CORBA_POLLABLESET___CI_ -+ -+ACE_INLINE CORBA_PollableSet_ptr -+tao_CORBA_PollableSet_duplicate ( -+ CORBA_PollableSet_ptr p -+ ) -+{ -+ return CORBA_PollableSet::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_CORBA_PollableSet_release ( -+ CORBA_PollableSet_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE CORBA_PollableSet_ptr -+tao_CORBA_PollableSet_nil ( -+ void -+ ) -+{ -+ return CORBA_PollableSet::_nil (); -+} -+ -+ACE_INLINE CORBA_PollableSet_ptr -+tao_CORBA_PollableSet_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return CORBA_PollableSet::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_CORBA_PollableSet_upcast ( -+ void *src -+ ) -+{ -+ CORBA_PollableSet **tmp = -+ ACE_static_cast (CORBA_PollableSet **, src); -+ return *tmp; -+} - - - #endif /* end #if !defined */ diff --git a/TAO/tao/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff index 9a9de357892..ed173b3775b 100644 --- a/TAO/tao/diffs/PortableInterceptor.diff +++ b/TAO/tao/diffs/PortableInterceptor.diff @@ -1,415 +1,49 @@ ---- PortableInterceptorC.h.old Fri Mar 2 12:18:45 2001 -+++ PortableInterceptorC.h Fri Mar 2 12:18:56 2001 -@@ -23,15 +23,17 @@ - #define _TAO_IDL_PORTABLEINTERCEPTORC_H_ +--- orig/PortableInterceptorC.h Tue Feb 5 14:36:22 2002 ++++ PortableInterceptorC.h Wed Feb 6 18:50:06 2002 +@@ -23,7 +23,7 @@ + #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_ #include "ace/pre.h" -#include "tao/corba.h" -+ -+#include "corbafwd.h" ++#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - --#include "tao/corbafwd.h" +@@ -34,6 +34,8 @@ #include "DynamicC.h" + #include "ObjectReferenceTemplateC.h" #include "MessagingC.h" -+#include "CurrentC.h" +#include "IOPC.h" ++#include "PolicyC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO -@@ -156,16 +158,14 @@ - } - - virtual char * name ( -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( +@@ -639,6 +641,7 @@ CORBA::SystemException )) = 0; - - virtual void destroy ( -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException -@@ -600,6 +600,8 @@ - CORBA::SystemException - )) = 0; - + +#if TAO_HAS_CORBA_MESSAGING == 1 -+ virtual Messaging::SyncScope sync_scope ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -608,6 +610,8 @@ - CORBA::SystemException - )) = 0; - -+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ -+ - virtual PortableInterceptor::ReplyStatus reply_status ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -1140,9 +1144,8 @@ - } - - virtual void send_request ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1150,27 +1153,24 @@ - )) = 0; - - virtual void send_poll ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void receive_reply ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void receive_exception ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1178,9 +1178,8 @@ - )) = 0; - - virtual void receive_other ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1301,9 +1300,8 @@ - } - - virtual void receive_request_service_contexts ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1311,9 +1309,8 @@ - )) = 0; - - virtual void receive_request ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1321,18 +1318,16 @@ - )) = 0; - - virtual void send_reply ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void send_exception ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1340,9 +1335,8 @@ - )) = 0; - - virtual void send_other ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1604,9 +1598,8 @@ - } - - virtual void establish_components ( -- PortableInterceptor::IORInfo_ptr info, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::IORInfo_ptr info -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException -@@ -1727,9 +1720,8 @@ - - virtual CORBA::Policy_ptr create_policy ( - CORBA::PolicyType type, -- const CORBA::Any & value, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ const CORBA::Any & value -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -2145,18 +2137,16 @@ - } - - virtual void pre_init ( -- PortableInterceptor::ORBInitInfo_ptr info, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ORBInitInfo_ptr info -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) + + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS +@@ -646,6 +649,7 @@ ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - virtual void post_init ( -- PortableInterceptor::ORBInitInfo_ptr info, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ORBInitInfo_ptr info -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException -@@ -2178,6 +2168,11 @@ - - #endif /* end #if !defined */ - -+/// Register an ORBInitializer with the global ORBInitializer -+/// table. -+TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( -+ ORBInitializer_ptr init, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - - } - TAO_NAMESPACE_CLOSE // module PortableInterceptor ---- PortableInterceptorC.i.old Fri Mar 2 12:16:13 2001 -+++ PortableInterceptorC.i Fri Mar 2 12:16:42 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: ---- PortableInterceptorC.cpp.old Fri Mar 2 12:16:13 2001 -+++ PortableInterceptorC.cpp Fri Mar 2 12:19:47 2001 -@@ -21,10 +21,6 @@ - - #include "PortableInterceptorC.h" - --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -- - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus - #endif /* __BORLANDC__ */ -@@ -33,6 +29,7 @@ - #include "PortableInterceptorC.i" - #endif /* !defined INLINE */ - -+#include "CORBA_String.h" - - // default constructor - PortableInterceptor::Interceptor::Interceptor () -@@ -91,7 +88,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -165,7 +162,7 @@ - { - return; - } -- -+ - ACE_THROW (CORBA::MARSHAL ()); - } - -@@ -178,7 +175,7 @@ - { - return; - } -- -+ - ACE_THROW (CORBA::MARSHAL ()); - } - -@@ -338,7 +335,7 @@ - { - return; - } -- -+ - ACE_THROW (CORBA::MARSHAL ()); - } - -@@ -351,7 +348,7 @@ - { - return; - } -- -+ - ACE_THROW (CORBA::MARSHAL ()); - } - -@@ -452,7 +449,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -521,7 +518,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -602,7 +599,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -683,7 +680,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -764,7 +761,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -845,7 +842,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -914,7 +911,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -995,7 +992,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -1064,7 +1061,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -1133,7 +1130,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)); -- -+ - if (retv) - this->_add_ref (); - return retv; -@@ -1348,7 +1345,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)); -- ++#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ + + virtual PortableInterceptor::ReplyStatus reply_status ( + +@@ -2272,6 +2276,12 @@ + class ORBInitializer; + typedef ORBInitializer *ORBInitializer_ptr; + ++ /// Register an ORBInitializer with the global ORBInitializer ++ /// table. ++ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( ++ ORBInitializer_ptr init ++ TAO_ENV_ARG_DECL_WITH_DEFAULTS); + - if (retv) - this->_add_ref (); - return retv; -@@ -1618,4 +1615,3 @@ - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -- + #endif /* end #if !defined */ + + diff --git a/TAO/tao/diffs/PortableInterceptorC.cpp.diff b/TAO/tao/diffs/PortableInterceptorC.cpp.diff deleted file mode 100644 index be72262a6d5..00000000000 --- a/TAO/tao/diffs/PortableInterceptorC.cpp.diff +++ /dev/null @@ -1,1037 +0,0 @@ ---- orig/PortableInterceptorC.cpp Wed Apr 25 00:17:34 2001 -+++ PortableInterceptorC.cpp Tue Apr 24 13:44:42 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -21,13 +21,6 @@ - - #include "PortableInterceptorC.h" - --#include "tao/Stub.h" --#include "tao/Invocation.h" --#include "tao/ClientRequestInfo.h" --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -- - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus - #endif /* __BORLANDC__ */ -@@ -36,48 +29,7 @@ - #include "PortableInterceptorC.i" - #endif /* !defined INLINE */ - --PortableInterceptor::Interceptor_ptr --tao_PortableInterceptor_Interceptor_duplicate ( -- PortableInterceptor::Interceptor_ptr p -- ) --{ -- return PortableInterceptor::Interceptor::_duplicate (p); --} -- --void --tao_PortableInterceptor_Interceptor_release ( -- PortableInterceptor::Interceptor_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::Interceptor_ptr --tao_PortableInterceptor_Interceptor_nil ( -- void -- ) --{ -- return PortableInterceptor::Interceptor::_nil (); --} -- --PortableInterceptor::Interceptor_ptr --tao_PortableInterceptor_Interceptor_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::Interceptor::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_Interceptor_upcast ( -- void *src -- ) --{ -- PortableInterceptor::Interceptor **tmp = -- ACE_static_cast (PortableInterceptor::Interceptor **, src); -- return *tmp; --} -+#include "CORBA_String.h" - - // ************************************************************* - // Operations for class PortableInterceptor::Interceptor_var -@@ -168,13 +120,13 @@ - } - - ::PortableInterceptor::Interceptor_ptr --PortableInterceptor::Interceptor_var::duplicate (Interceptor_ptr p) -+PortableInterceptor::Interceptor_var::duplicate (PortableInterceptor::Interceptor_ptr p) - { - return ::PortableInterceptor::Interceptor::_duplicate (p); - } - - void --PortableInterceptor::Interceptor_var::release (Interceptor_ptr p) -+PortableInterceptor::Interceptor_var::release (PortableInterceptor::Interceptor_ptr p) - { - CORBA::release (p); - } -@@ -197,11 +149,10 @@ - CORBA::Object * - PortableInterceptor::Interceptor_var::upcast (void *src) - { -- Interceptor **tmp = -- ACE_static_cast (Interceptor **, src); -+ PortableInterceptor::Interceptor **tmp = -+ ACE_static_cast (PortableInterceptor::Interceptor **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::Interceptor_out - // ************************************************************* -@@ -489,7 +440,6 @@ - TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableInterceptor_ForwardRequest) - TAO_NAMESPACE_END - -- - // TAO extension - the virtual _type method. - CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const - { -@@ -692,7 +642,6 @@ - ACE_NTOHL (0x6c6f7400), // name = InvalidSlot - 0, // member count - }; -- - static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot ( - CORBA::tk_except, - sizeof (_oc_PortableInterceptor_InvalidSlot), -@@ -706,55 +655,12 @@ - TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InvalidSlot, &_tc_TAO_tc_PortableInterceptor_InvalidSlot) - TAO_NAMESPACE_END - -- - // TAO extension - the virtual _type method. - CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const - { - return ::PortableInterceptor::_tc_InvalidSlot; - } - --PortableInterceptor::Current_ptr --tao_PortableInterceptor_Current_duplicate ( -- PortableInterceptor::Current_ptr p -- ) --{ -- return PortableInterceptor::Current::_duplicate (p); --} -- --void --tao_PortableInterceptor_Current_release ( -- PortableInterceptor::Current_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::Current_ptr --tao_PortableInterceptor_Current_nil ( -- void -- ) --{ -- return PortableInterceptor::Current::_nil (); --} -- --PortableInterceptor::Current_ptr --tao_PortableInterceptor_Current_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::Current::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_Current_upcast ( -- void *src -- ) --{ -- PortableInterceptor::Current **tmp = -- ACE_static_cast (PortableInterceptor::Current **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::Current_var -@@ -845,13 +751,13 @@ - } - - ::PortableInterceptor::Current_ptr --PortableInterceptor::Current_var::duplicate (Current_ptr p) -+PortableInterceptor::Current_var::duplicate (PortableInterceptor::Current_ptr p) - { - return ::PortableInterceptor::Current::_duplicate (p); - } - - void --PortableInterceptor::Current_var::release (Current_ptr p) -+PortableInterceptor::Current_var::release (PortableInterceptor::Current_ptr p) - { - CORBA::release (p); - } -@@ -874,11 +780,10 @@ - CORBA::Object * - PortableInterceptor::Current_var::upcast (void *src) - { -- Current **tmp = -- ACE_static_cast (Current **, src); -+ PortableInterceptor::Current **tmp = -+ ACE_static_cast (PortableInterceptor::Current **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::Current_out - // ************************************************************* -@@ -1019,48 +924,6 @@ - return "IDL:PortableInterceptor/Current:1.0"; - } - --PortableInterceptor::RequestInfo_ptr --tao_PortableInterceptor_RequestInfo_duplicate ( -- PortableInterceptor::RequestInfo_ptr p -- ) --{ -- return PortableInterceptor::RequestInfo::_duplicate (p); --} -- --void --tao_PortableInterceptor_RequestInfo_release ( -- PortableInterceptor::RequestInfo_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::RequestInfo_ptr --tao_PortableInterceptor_RequestInfo_nil ( -- void -- ) --{ -- return PortableInterceptor::RequestInfo::_nil (); --} -- --PortableInterceptor::RequestInfo_ptr --tao_PortableInterceptor_RequestInfo_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::RequestInfo::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_RequestInfo_upcast ( -- void *src -- ) --{ -- PortableInterceptor::RequestInfo **tmp = -- ACE_static_cast (PortableInterceptor::RequestInfo **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::RequestInfo_var -@@ -1151,13 +1014,13 @@ - } - - ::PortableInterceptor::RequestInfo_ptr --PortableInterceptor::RequestInfo_var::duplicate (RequestInfo_ptr p) -+PortableInterceptor::RequestInfo_var::duplicate (PortableInterceptor::RequestInfo_ptr p) - { - return ::PortableInterceptor::RequestInfo::_duplicate (p); - } - - void --PortableInterceptor::RequestInfo_var::release (RequestInfo_ptr p) -+PortableInterceptor::RequestInfo_var::release (PortableInterceptor::RequestInfo_ptr p) - { - CORBA::release (p); - } -@@ -1180,11 +1043,10 @@ - CORBA::Object * - PortableInterceptor::RequestInfo_var::upcast (void *src) - { -- RequestInfo **tmp = -- ACE_static_cast (RequestInfo **, src); -+ PortableInterceptor::RequestInfo **tmp = -+ ACE_static_cast (PortableInterceptor::RequestInfo **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::RequestInfo_out - // ************************************************************* -@@ -1313,48 +1175,6 @@ - return "IDL:PortableInterceptor/RequestInfo:1.0"; - } - --PortableInterceptor::ClientRequestInfo_ptr --tao_PortableInterceptor_ClientRequestInfo_duplicate ( -- PortableInterceptor::ClientRequestInfo_ptr p -- ) --{ -- return PortableInterceptor::ClientRequestInfo::_duplicate (p); --} -- --void --tao_PortableInterceptor_ClientRequestInfo_release ( -- PortableInterceptor::ClientRequestInfo_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::ClientRequestInfo_ptr --tao_PortableInterceptor_ClientRequestInfo_nil ( -- void -- ) --{ -- return PortableInterceptor::ClientRequestInfo::_nil (); --} -- --PortableInterceptor::ClientRequestInfo_ptr --tao_PortableInterceptor_ClientRequestInfo_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::ClientRequestInfo::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_ClientRequestInfo_upcast ( -- void *src -- ) --{ -- PortableInterceptor::ClientRequestInfo **tmp = -- ACE_static_cast (PortableInterceptor::ClientRequestInfo **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::ClientRequestInfo_var -@@ -1445,13 +1265,13 @@ - } - - ::PortableInterceptor::ClientRequestInfo_ptr --PortableInterceptor::ClientRequestInfo_var::duplicate (ClientRequestInfo_ptr p) -+PortableInterceptor::ClientRequestInfo_var::duplicate (PortableInterceptor::ClientRequestInfo_ptr p) - { - return ::PortableInterceptor::ClientRequestInfo::_duplicate (p); - } - - void --PortableInterceptor::ClientRequestInfo_var::release (ClientRequestInfo_ptr p) -+PortableInterceptor::ClientRequestInfo_var::release (PortableInterceptor::ClientRequestInfo_ptr p) - { - CORBA::release (p); - } -@@ -1474,11 +1294,10 @@ - CORBA::Object * - PortableInterceptor::ClientRequestInfo_var::upcast (void *src) - { -- ClientRequestInfo **tmp = -- ACE_static_cast (ClientRequestInfo **, src); -+ PortableInterceptor::ClientRequestInfo **tmp = -+ ACE_static_cast (PortableInterceptor::ClientRequestInfo **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::ClientRequestInfo_out - // ************************************************************* -@@ -1619,48 +1438,6 @@ - return "IDL:PortableInterceptor/ClientRequestInfo:1.0"; - } - --PortableInterceptor::ServerRequestInfo_ptr --tao_PortableInterceptor_ServerRequestInfo_duplicate ( -- PortableInterceptor::ServerRequestInfo_ptr p -- ) --{ -- return PortableInterceptor::ServerRequestInfo::_duplicate (p); --} -- --void --tao_PortableInterceptor_ServerRequestInfo_release ( -- PortableInterceptor::ServerRequestInfo_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::ServerRequestInfo_ptr --tao_PortableInterceptor_ServerRequestInfo_nil ( -- void -- ) --{ -- return PortableInterceptor::ServerRequestInfo::_nil (); --} -- --PortableInterceptor::ServerRequestInfo_ptr --tao_PortableInterceptor_ServerRequestInfo_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::ServerRequestInfo::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_ServerRequestInfo_upcast ( -- void *src -- ) --{ -- PortableInterceptor::ServerRequestInfo **tmp = -- ACE_static_cast (PortableInterceptor::ServerRequestInfo **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::ServerRequestInfo_var -@@ -1751,13 +1528,13 @@ - } - - ::PortableInterceptor::ServerRequestInfo_ptr --PortableInterceptor::ServerRequestInfo_var::duplicate (ServerRequestInfo_ptr p) -+PortableInterceptor::ServerRequestInfo_var::duplicate (PortableInterceptor::ServerRequestInfo_ptr p) - { - return ::PortableInterceptor::ServerRequestInfo::_duplicate (p); - } - - void --PortableInterceptor::ServerRequestInfo_var::release (ServerRequestInfo_ptr p) -+PortableInterceptor::ServerRequestInfo_var::release (PortableInterceptor::ServerRequestInfo_ptr p) - { - CORBA::release (p); - } -@@ -1780,11 +1557,10 @@ - CORBA::Object * - PortableInterceptor::ServerRequestInfo_var::upcast (void *src) - { -- ServerRequestInfo **tmp = -- ACE_static_cast (ServerRequestInfo **, src); -+ PortableInterceptor::ServerRequestInfo **tmp = -+ ACE_static_cast (PortableInterceptor::ServerRequestInfo **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::ServerRequestInfo_out - // ************************************************************* -@@ -1925,48 +1701,6 @@ - return "IDL:PortableInterceptor/ServerRequestInfo:1.0"; - } - --PortableInterceptor::ClientRequestInterceptor_ptr --tao_PortableInterceptor_ClientRequestInterceptor_duplicate ( -- PortableInterceptor::ClientRequestInterceptor_ptr p -- ) --{ -- return PortableInterceptor::ClientRequestInterceptor::_duplicate (p); --} -- --void --tao_PortableInterceptor_ClientRequestInterceptor_release ( -- PortableInterceptor::ClientRequestInterceptor_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::ClientRequestInterceptor_ptr --tao_PortableInterceptor_ClientRequestInterceptor_nil ( -- void -- ) --{ -- return PortableInterceptor::ClientRequestInterceptor::_nil (); --} -- --PortableInterceptor::ClientRequestInterceptor_ptr --tao_PortableInterceptor_ClientRequestInterceptor_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::ClientRequestInterceptor::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_ClientRequestInterceptor_upcast ( -- void *src -- ) --{ -- PortableInterceptor::ClientRequestInterceptor **tmp = -- ACE_static_cast (PortableInterceptor::ClientRequestInterceptor **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::ClientRequestInterceptor_var -@@ -2057,13 +1791,13 @@ - } - - ::PortableInterceptor::ClientRequestInterceptor_ptr --PortableInterceptor::ClientRequestInterceptor_var::duplicate (ClientRequestInterceptor_ptr p) -+PortableInterceptor::ClientRequestInterceptor_var::duplicate (PortableInterceptor::ClientRequestInterceptor_ptr p) - { - return ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p); - } - - void --PortableInterceptor::ClientRequestInterceptor_var::release (ClientRequestInterceptor_ptr p) -+PortableInterceptor::ClientRequestInterceptor_var::release (PortableInterceptor::ClientRequestInterceptor_ptr p) - { - CORBA::release (p); - } -@@ -2086,11 +1820,10 @@ - CORBA::Object * - PortableInterceptor::ClientRequestInterceptor_var::upcast (void *src) - { -- ClientRequestInterceptor **tmp = -- ACE_static_cast (ClientRequestInterceptor **, src); -+ PortableInterceptor::ClientRequestInterceptor **tmp = -+ ACE_static_cast (PortableInterceptor::ClientRequestInterceptor **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::ClientRequestInterceptor_out - // ************************************************************* -@@ -2231,48 +1964,6 @@ - return "IDL:PortableInterceptor/ClientRequestInterceptor:1.0"; - } - --PortableInterceptor::ServerRequestInterceptor_ptr --tao_PortableInterceptor_ServerRequestInterceptor_duplicate ( -- PortableInterceptor::ServerRequestInterceptor_ptr p -- ) --{ -- return PortableInterceptor::ServerRequestInterceptor::_duplicate (p); --} -- --void --tao_PortableInterceptor_ServerRequestInterceptor_release ( -- PortableInterceptor::ServerRequestInterceptor_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::ServerRequestInterceptor_ptr --tao_PortableInterceptor_ServerRequestInterceptor_nil ( -- void -- ) --{ -- return PortableInterceptor::ServerRequestInterceptor::_nil (); --} -- --PortableInterceptor::ServerRequestInterceptor_ptr --tao_PortableInterceptor_ServerRequestInterceptor_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::ServerRequestInterceptor::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_ServerRequestInterceptor_upcast ( -- void *src -- ) --{ -- PortableInterceptor::ServerRequestInterceptor **tmp = -- ACE_static_cast (PortableInterceptor::ServerRequestInterceptor **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::ServerRequestInterceptor_var -@@ -2363,13 +2054,13 @@ - } - - ::PortableInterceptor::ServerRequestInterceptor_ptr --PortableInterceptor::ServerRequestInterceptor_var::duplicate (ServerRequestInterceptor_ptr p) -+PortableInterceptor::ServerRequestInterceptor_var::duplicate (PortableInterceptor::ServerRequestInterceptor_ptr p) - { - return ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p); - } - - void --PortableInterceptor::ServerRequestInterceptor_var::release (ServerRequestInterceptor_ptr p) -+PortableInterceptor::ServerRequestInterceptor_var::release (PortableInterceptor::ServerRequestInterceptor_ptr p) - { - CORBA::release (p); - } -@@ -2392,11 +2083,10 @@ - CORBA::Object * - PortableInterceptor::ServerRequestInterceptor_var::upcast (void *src) - { -- ServerRequestInterceptor **tmp = -- ACE_static_cast (ServerRequestInterceptor **, src); -+ PortableInterceptor::ServerRequestInterceptor **tmp = -+ ACE_static_cast (PortableInterceptor::ServerRequestInterceptor **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::ServerRequestInterceptor_out - // ************************************************************* -@@ -2537,48 +2227,6 @@ - return "IDL:PortableInterceptor/ServerRequestInterceptor:1.0"; - } - --PortableInterceptor::IORInfo_ptr --tao_PortableInterceptor_IORInfo_duplicate ( -- PortableInterceptor::IORInfo_ptr p -- ) --{ -- return PortableInterceptor::IORInfo::_duplicate (p); --} -- --void --tao_PortableInterceptor_IORInfo_release ( -- PortableInterceptor::IORInfo_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::IORInfo_ptr --tao_PortableInterceptor_IORInfo_nil ( -- void -- ) --{ -- return PortableInterceptor::IORInfo::_nil (); --} -- --PortableInterceptor::IORInfo_ptr --tao_PortableInterceptor_IORInfo_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::IORInfo::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_IORInfo_upcast ( -- void *src -- ) --{ -- PortableInterceptor::IORInfo **tmp = -- ACE_static_cast (PortableInterceptor::IORInfo **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::IORInfo_var -@@ -2669,13 +2317,13 @@ - } - - ::PortableInterceptor::IORInfo_ptr --PortableInterceptor::IORInfo_var::duplicate (IORInfo_ptr p) -+PortableInterceptor::IORInfo_var::duplicate (PortableInterceptor::IORInfo_ptr p) - { - return ::PortableInterceptor::IORInfo::_duplicate (p); - } - - void --PortableInterceptor::IORInfo_var::release (IORInfo_ptr p) -+PortableInterceptor::IORInfo_var::release (PortableInterceptor::IORInfo_ptr p) - { - CORBA::release (p); - } -@@ -2698,11 +2346,10 @@ - CORBA::Object * - PortableInterceptor::IORInfo_var::upcast (void *src) - { -- IORInfo **tmp = -- ACE_static_cast (IORInfo **, src); -+ PortableInterceptor::IORInfo **tmp = -+ ACE_static_cast (PortableInterceptor::IORInfo **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::IORInfo_out - // ************************************************************* -@@ -2831,48 +2478,6 @@ - return "IDL:PortableInterceptor/IORInfo:1.0"; - } - --PortableInterceptor::IORInterceptor_ptr --tao_PortableInterceptor_IORInterceptor_duplicate ( -- PortableInterceptor::IORInterceptor_ptr p -- ) --{ -- return PortableInterceptor::IORInterceptor::_duplicate (p); --} -- --void --tao_PortableInterceptor_IORInterceptor_release ( -- PortableInterceptor::IORInterceptor_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::IORInterceptor_ptr --tao_PortableInterceptor_IORInterceptor_nil ( -- void -- ) --{ -- return PortableInterceptor::IORInterceptor::_nil (); --} -- --PortableInterceptor::IORInterceptor_ptr --tao_PortableInterceptor_IORInterceptor_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::IORInterceptor::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_IORInterceptor_upcast ( -- void *src -- ) --{ -- PortableInterceptor::IORInterceptor **tmp = -- ACE_static_cast (PortableInterceptor::IORInterceptor **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::IORInterceptor_var -@@ -2963,13 +2568,13 @@ - } - - ::PortableInterceptor::IORInterceptor_ptr --PortableInterceptor::IORInterceptor_var::duplicate (IORInterceptor_ptr p) -+PortableInterceptor::IORInterceptor_var::duplicate (PortableInterceptor::IORInterceptor_ptr p) - { - return ::PortableInterceptor::IORInterceptor::_duplicate (p); - } - - void --PortableInterceptor::IORInterceptor_var::release (IORInterceptor_ptr p) -+PortableInterceptor::IORInterceptor_var::release (PortableInterceptor::IORInterceptor_ptr p) - { - CORBA::release (p); - } -@@ -2992,11 +2597,10 @@ - CORBA::Object * - PortableInterceptor::IORInterceptor_var::upcast (void *src) - { -- IORInterceptor **tmp = -- ACE_static_cast (IORInterceptor **, src); -+ PortableInterceptor::IORInterceptor **tmp = -+ ACE_static_cast (PortableInterceptor::IORInterceptor **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::IORInterceptor_out - // ************************************************************* -@@ -3137,48 +2741,6 @@ - return "IDL:PortableInterceptor/IORInterceptor:1.0"; - } - --PortableInterceptor::PolicyFactory_ptr --tao_PortableInterceptor_PolicyFactory_duplicate ( -- PortableInterceptor::PolicyFactory_ptr p -- ) --{ -- return PortableInterceptor::PolicyFactory::_duplicate (p); --} -- --void --tao_PortableInterceptor_PolicyFactory_release ( -- PortableInterceptor::PolicyFactory_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::PolicyFactory_ptr --tao_PortableInterceptor_PolicyFactory_nil ( -- void -- ) --{ -- return PortableInterceptor::PolicyFactory::_nil (); --} -- --PortableInterceptor::PolicyFactory_ptr --tao_PortableInterceptor_PolicyFactory_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::PolicyFactory::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_PolicyFactory_upcast ( -- void *src -- ) --{ -- PortableInterceptor::PolicyFactory **tmp = -- ACE_static_cast (PortableInterceptor::PolicyFactory **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::PolicyFactory_var -@@ -3269,13 +2831,13 @@ - } - - ::PortableInterceptor::PolicyFactory_ptr --PortableInterceptor::PolicyFactory_var::duplicate (PolicyFactory_ptr p) -+PortableInterceptor::PolicyFactory_var::duplicate (PortableInterceptor::PolicyFactory_ptr p) - { - return ::PortableInterceptor::PolicyFactory::_duplicate (p); - } - - void --PortableInterceptor::PolicyFactory_var::release (PolicyFactory_ptr p) -+PortableInterceptor::PolicyFactory_var::release (PortableInterceptor::PolicyFactory_ptr p) - { - CORBA::release (p); - } -@@ -3298,11 +2860,10 @@ - CORBA::Object * - PortableInterceptor::PolicyFactory_var::upcast (void *src) - { -- PolicyFactory **tmp = -- ACE_static_cast (PolicyFactory **, src); -+ PortableInterceptor::PolicyFactory **tmp = -+ ACE_static_cast (PortableInterceptor::PolicyFactory **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::PolicyFactory_out - // ************************************************************* -@@ -3431,48 +2992,6 @@ - return "IDL:PortableInterceptor/PolicyFactory:1.0"; - } - --PortableInterceptor::ORBInitInfo_ptr --tao_PortableInterceptor_ORBInitInfo_duplicate ( -- PortableInterceptor::ORBInitInfo_ptr p -- ) --{ -- return PortableInterceptor::ORBInitInfo::_duplicate (p); --} -- --void --tao_PortableInterceptor_ORBInitInfo_release ( -- PortableInterceptor::ORBInitInfo_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::ORBInitInfo_ptr --tao_PortableInterceptor_ORBInitInfo_nil ( -- void -- ) --{ -- return PortableInterceptor::ORBInitInfo::_nil (); --} -- --PortableInterceptor::ORBInitInfo_ptr --tao_PortableInterceptor_ORBInitInfo_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::ORBInitInfo::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_ORBInitInfo_upcast ( -- void *src -- ) --{ -- PortableInterceptor::ORBInitInfo **tmp = -- ACE_static_cast (PortableInterceptor::ORBInitInfo **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::ORBInitInfo_var -@@ -3563,13 +3082,13 @@ - } - - ::PortableInterceptor::ORBInitInfo_ptr --PortableInterceptor::ORBInitInfo_var::duplicate (ORBInitInfo_ptr p) -+PortableInterceptor::ORBInitInfo_var::duplicate (PortableInterceptor::ORBInitInfo_ptr p) - { - return ::PortableInterceptor::ORBInitInfo::_duplicate (p); - } - - void --PortableInterceptor::ORBInitInfo_var::release (ORBInitInfo_ptr p) -+PortableInterceptor::ORBInitInfo_var::release (PortableInterceptor::ORBInitInfo_ptr p) - { - CORBA::release (p); - } -@@ -3592,11 +3111,10 @@ - CORBA::Object * - PortableInterceptor::ORBInitInfo_var::upcast (void *src) - { -- ORBInitInfo **tmp = -- ACE_static_cast (ORBInitInfo **, src); -+ PortableInterceptor::ORBInitInfo **tmp = -+ ACE_static_cast (PortableInterceptor::ORBInitInfo **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::ORBInitInfo_out - // ************************************************************* -@@ -3871,48 +3389,6 @@ - return retval; - } - --PortableInterceptor::ORBInitializer_ptr --tao_PortableInterceptor_ORBInitializer_duplicate ( -- PortableInterceptor::ORBInitializer_ptr p -- ) --{ -- return PortableInterceptor::ORBInitializer::_duplicate (p); --} -- --void --tao_PortableInterceptor_ORBInitializer_release ( -- PortableInterceptor::ORBInitializer_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableInterceptor::ORBInitializer_ptr --tao_PortableInterceptor_ORBInitializer_nil ( -- void -- ) --{ -- return PortableInterceptor::ORBInitializer::_nil (); --} -- --PortableInterceptor::ORBInitializer_ptr --tao_PortableInterceptor_ORBInitializer_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return PortableInterceptor::ORBInitializer::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_PortableInterceptor_ORBInitializer_upcast ( -- void *src -- ) --{ -- PortableInterceptor::ORBInitializer **tmp = -- ACE_static_cast (PortableInterceptor::ORBInitializer **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class PortableInterceptor::ORBInitializer_var -@@ -4003,13 +3479,13 @@ - } - - ::PortableInterceptor::ORBInitializer_ptr --PortableInterceptor::ORBInitializer_var::duplicate (ORBInitializer_ptr p) -+PortableInterceptor::ORBInitializer_var::duplicate (PortableInterceptor::ORBInitializer_ptr p) - { - return ::PortableInterceptor::ORBInitializer::_duplicate (p); - } - - void --PortableInterceptor::ORBInitializer_var::release (ORBInitializer_ptr p) -+PortableInterceptor::ORBInitializer_var::release (PortableInterceptor::ORBInitializer_ptr p) - { - CORBA::release (p); - } -@@ -4032,11 +3508,10 @@ - CORBA::Object * - PortableInterceptor::ORBInitializer_var::upcast (void *src) - { -- ORBInitializer **tmp = -- ACE_static_cast (ORBInitializer **, src); -+ PortableInterceptor::ORBInitializer **tmp = -+ ACE_static_cast (PortableInterceptor::ORBInitializer **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class PortableInterceptor::ORBInitializer_out - // ************************************************************* -@@ -4211,12 +3686,14 @@ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); -- -- CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ForwardRequest, ACE_TRY_ENV); -+ CORBA::Boolean result = -+ type->equivalent (PortableInterceptor::_tc_ForwardRequest, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -- return 0; // not equivalent -+ { -+ return 0; -+ } - - if (_tao_any.any_owns_data ()) - { -@@ -4301,12 +3778,14 @@ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); -- -- CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_InvalidSlot, ACE_TRY_ENV); -+ CORBA::Boolean result = -+ type->equivalent (PortableInterceptor::_tc_InvalidSlot, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -- return 0; // not equivalent -+ { -+ return 0; -+ } - - if (_tao_any.any_owns_data ()) - { -@@ -4428,4 +3907,3 @@ - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -- diff --git a/TAO/tao/diffs/PortableInterceptorC.h.diff b/TAO/tao/diffs/PortableInterceptorC.h.diff deleted file mode 100644 index 4bf816154e2..00000000000 --- a/TAO/tao/diffs/PortableInterceptorC.h.diff +++ /dev/null @@ -1,249 +0,0 @@ ---- orig/PortableInterceptorC.h Wed Apr 25 00:17:34 2001 -+++ PortableInterceptorC.h Tue Apr 24 13:44:42 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -16about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_ --#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_ -+#ifndef _TAO_IDL_PORTABLEINTERCEPTORC_H_ -+#define _TAO_IDL_PORTABLEINTERCEPTORC_H_ - - #include "ace/pre.h" --#include "tao/corba.h" -+ -+#include "corbafwd.h" - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - --#include "tao/corbafwd.h" - #include "DynamicC.h" - #include "MessagingC.h" -+#include "CurrentC.h" -+#include "IOPC.h" -+#include "PolicyC.h" - - #if defined (TAO_EXPORT_MACRO) - #undef TAO_EXPORT_MACRO -@@ -164,16 +166,14 @@ - } - - virtual char * name ( -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void destroy ( -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException -@@ -624,6 +624,8 @@ - CORBA::SystemException - )) = 0; - -+#if TAO_HAS_CORBA_MESSAGING == 1 -+ - virtual Messaging::SyncScope sync_scope ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -632,6 +634,8 @@ - CORBA::SystemException - )) = 0; - -+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ -+ - virtual PortableInterceptor::ReplyStatus reply_status ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () -@@ -1188,9 +1192,8 @@ - } - - virtual void send_request ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1198,27 +1201,24 @@ - )) = 0; - - virtual void send_poll ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void receive_reply ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void receive_exception ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1226,9 +1226,8 @@ - )) = 0; - - virtual void receive_other ( -- PortableInterceptor::ClientRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ClientRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1357,9 +1356,8 @@ - } - - virtual void receive_request_service_contexts ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1367,9 +1365,8 @@ - )) = 0; - - virtual void receive_request ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1377,18 +1374,16 @@ - )) = 0; - - virtual void send_reply ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void send_exception ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1396,9 +1391,8 @@ - )) = 0; - - virtual void send_other ( -- PortableInterceptor::ServerRequestInfo_ptr ri, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ServerRequestInfo_ptr ri -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -1676,9 +1670,8 @@ - } - - virtual void establish_components ( -- PortableInterceptor::IORInfo_ptr info, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::IORInfo_ptr info -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException -@@ -1807,9 +1800,8 @@ - - virtual CORBA::Policy_ptr create_policy ( - CORBA::PolicyType type, -- const CORBA::Any & value, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ const CORBA::Any & value -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, -@@ -2241,18 +2233,16 @@ - } - - virtual void pre_init ( -- PortableInterceptor::ORBInitInfo_ptr info, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ORBInitInfo_ptr info -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void post_init ( -- PortableInterceptor::ORBInitInfo_ptr info, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -+ PortableInterceptor::ORBInitInfo_ptr info -+ TAO_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException -@@ -2274,6 +2264,11 @@ - - #endif /* end #if !defined */ - -+/// Register an ORBInitializer with the global ORBInitializer -+/// table. -+TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( -+ ORBInitializer_ptr init, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - - } - TAO_NAMESPACE_CLOSE // module PortableInterceptor diff --git a/TAO/tao/diffs/PortableInterceptorC.i.diff b/TAO/tao/diffs/PortableInterceptorC.i.diff deleted file mode 100644 index cd22049fc88..00000000000 --- a/TAO/tao/diffs/PortableInterceptorC.i.diff +++ /dev/null @@ -1,609 +0,0 @@ ---- orig/PortableInterceptorC.i Wed Apr 25 00:17:34 2001 -+++ PortableInterceptorC.i Tue Apr 24 13:44:42 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,6 +23,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___CI_) - #define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_ - -+ACE_INLINE PortableInterceptor::Interceptor_ptr -+tao_PortableInterceptor_Interceptor_duplicate ( -+ PortableInterceptor::Interceptor_ptr p -+ ) -+{ -+ return PortableInterceptor::Interceptor::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_Interceptor_release ( -+ PortableInterceptor::Interceptor_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::Interceptor_ptr -+tao_PortableInterceptor_Interceptor_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::Interceptor::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::Interceptor_ptr -+tao_PortableInterceptor_Interceptor_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::Interceptor::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_Interceptor_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::Interceptor **tmp = -+ ACE_static_cast (PortableInterceptor::Interceptor **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -38,6 +81,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_CURRENT___CI_) - #define _PORTABLEINTERCEPTOR_CURRENT___CI_ - -+ACE_INLINE PortableInterceptor::Current_ptr -+tao_PortableInterceptor_Current_duplicate ( -+ PortableInterceptor::Current_ptr p -+ ) -+{ -+ return PortableInterceptor::Current::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_Current_release ( -+ PortableInterceptor::Current_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::Current_ptr -+tao_PortableInterceptor_Current_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::Current::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::Current_ptr -+tao_PortableInterceptor_Current_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::Current::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_Current_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::Current **tmp = -+ ACE_static_cast (PortableInterceptor::Current **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -45,6 +131,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___CI_) - #define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_ - -+ACE_INLINE PortableInterceptor::RequestInfo_ptr -+tao_PortableInterceptor_RequestInfo_duplicate ( -+ PortableInterceptor::RequestInfo_ptr p -+ ) -+{ -+ return PortableInterceptor::RequestInfo::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_RequestInfo_release ( -+ PortableInterceptor::RequestInfo_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::RequestInfo_ptr -+tao_PortableInterceptor_RequestInfo_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::RequestInfo::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::RequestInfo_ptr -+tao_PortableInterceptor_RequestInfo_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::RequestInfo::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_RequestInfo_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::RequestInfo **tmp = -+ ACE_static_cast (PortableInterceptor::RequestInfo **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -52,6 +181,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_) - #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_ - -+ACE_INLINE PortableInterceptor::ClientRequestInfo_ptr -+tao_PortableInterceptor_ClientRequestInfo_duplicate ( -+ PortableInterceptor::ClientRequestInfo_ptr p -+ ) -+{ -+ return PortableInterceptor::ClientRequestInfo::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_ClientRequestInfo_release ( -+ PortableInterceptor::ClientRequestInfo_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::ClientRequestInfo_ptr -+tao_PortableInterceptor_ClientRequestInfo_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::ClientRequestInfo::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::ClientRequestInfo_ptr -+tao_PortableInterceptor_ClientRequestInfo_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::ClientRequestInfo::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_ClientRequestInfo_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::ClientRequestInfo **tmp = -+ ACE_static_cast (PortableInterceptor::ClientRequestInfo **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -59,6 +231,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_) - #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_ - -+ACE_INLINE PortableInterceptor::ServerRequestInfo_ptr -+tao_PortableInterceptor_ServerRequestInfo_duplicate ( -+ PortableInterceptor::ServerRequestInfo_ptr p -+ ) -+{ -+ return PortableInterceptor::ServerRequestInfo::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_ServerRequestInfo_release ( -+ PortableInterceptor::ServerRequestInfo_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::ServerRequestInfo_ptr -+tao_PortableInterceptor_ServerRequestInfo_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::ServerRequestInfo::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::ServerRequestInfo_ptr -+tao_PortableInterceptor_ServerRequestInfo_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::ServerRequestInfo::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_ServerRequestInfo_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::ServerRequestInfo **tmp = -+ ACE_static_cast (PortableInterceptor::ServerRequestInfo **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -66,6 +281,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_) - #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_ - -+ACE_INLINE PortableInterceptor::ClientRequestInterceptor_ptr -+tao_PortableInterceptor_ClientRequestInterceptor_duplicate ( -+ PortableInterceptor::ClientRequestInterceptor_ptr p -+ ) -+{ -+ return PortableInterceptor::ClientRequestInterceptor::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_ClientRequestInterceptor_release ( -+ PortableInterceptor::ClientRequestInterceptor_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::ClientRequestInterceptor_ptr -+tao_PortableInterceptor_ClientRequestInterceptor_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::ClientRequestInterceptor::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::ClientRequestInterceptor_ptr -+tao_PortableInterceptor_ClientRequestInterceptor_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::ClientRequestInterceptor::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_ClientRequestInterceptor_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::ClientRequestInterceptor **tmp = -+ ACE_static_cast (PortableInterceptor::ClientRequestInterceptor **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -73,6 +331,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_) - #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_ - -+ACE_INLINE PortableInterceptor::ServerRequestInterceptor_ptr -+tao_PortableInterceptor_ServerRequestInterceptor_duplicate ( -+ PortableInterceptor::ServerRequestInterceptor_ptr p -+ ) -+{ -+ return PortableInterceptor::ServerRequestInterceptor::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_ServerRequestInterceptor_release ( -+ PortableInterceptor::ServerRequestInterceptor_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::ServerRequestInterceptor_ptr -+tao_PortableInterceptor_ServerRequestInterceptor_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::ServerRequestInterceptor::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::ServerRequestInterceptor_ptr -+tao_PortableInterceptor_ServerRequestInterceptor_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::ServerRequestInterceptor::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_ServerRequestInterceptor_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::ServerRequestInterceptor **tmp = -+ ACE_static_cast (PortableInterceptor::ServerRequestInterceptor **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -80,6 +381,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_) - #define _PORTABLEINTERCEPTOR_IORINFO___CI_ - -+ACE_INLINE PortableInterceptor::IORInfo_ptr -+tao_PortableInterceptor_IORInfo_duplicate ( -+ PortableInterceptor::IORInfo_ptr p -+ ) -+{ -+ return PortableInterceptor::IORInfo::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_IORInfo_release ( -+ PortableInterceptor::IORInfo_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::IORInfo_ptr -+tao_PortableInterceptor_IORInfo_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::IORInfo::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::IORInfo_ptr -+tao_PortableInterceptor_IORInfo_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::IORInfo::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_IORInfo_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::IORInfo **tmp = -+ ACE_static_cast (PortableInterceptor::IORInfo **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -87,6 +431,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_) - #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_ - -+ACE_INLINE PortableInterceptor::IORInterceptor_ptr -+tao_PortableInterceptor_IORInterceptor_duplicate ( -+ PortableInterceptor::IORInterceptor_ptr p -+ ) -+{ -+ return PortableInterceptor::IORInterceptor::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_IORInterceptor_release ( -+ PortableInterceptor::IORInterceptor_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::IORInterceptor_ptr -+tao_PortableInterceptor_IORInterceptor_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::IORInterceptor::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::IORInterceptor_ptr -+tao_PortableInterceptor_IORInterceptor_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::IORInterceptor::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_IORInterceptor_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::IORInterceptor **tmp = -+ ACE_static_cast (PortableInterceptor::IORInterceptor **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -94,6 +481,49 @@ - #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_) - #define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_ - -+ACE_INLINE PortableInterceptor::PolicyFactory_ptr -+tao_PortableInterceptor_PolicyFactory_duplicate ( -+ PortableInterceptor::PolicyFactory_ptr p -+ ) -+{ -+ return PortableInterceptor::PolicyFactory::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_PolicyFactory_release ( -+ PortableInterceptor::PolicyFactory_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::PolicyFactory_ptr -+tao_PortableInterceptor_PolicyFactory_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::PolicyFactory::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::PolicyFactory_ptr -+tao_PortableInterceptor_PolicyFactory_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::PolicyFactory::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_PolicyFactory_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::PolicyFactory **tmp = -+ ACE_static_cast (PortableInterceptor::PolicyFactory **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -109,12 +539,98 @@ - #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___CI_) - #define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_ - -+ACE_INLINE PortableInterceptor::ORBInitInfo_ptr -+tao_PortableInterceptor_ORBInitInfo_duplicate ( -+ PortableInterceptor::ORBInitInfo_ptr p -+ ) -+{ -+ return PortableInterceptor::ORBInitInfo::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_ORBInitInfo_release ( -+ PortableInterceptor::ORBInitInfo_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::ORBInitInfo_ptr -+tao_PortableInterceptor_ORBInitInfo_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::ORBInitInfo::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::ORBInitInfo_ptr -+tao_PortableInterceptor_ORBInitInfo_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::ORBInitInfo::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_ORBInitInfo_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::ORBInitInfo **tmp = -+ ACE_static_cast (PortableInterceptor::ORBInitInfo **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - - - #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_) - #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_ -+ -+ACE_INLINE PortableInterceptor::ORBInitializer_ptr -+tao_PortableInterceptor_ORBInitializer_duplicate ( -+ PortableInterceptor::ORBInitializer_ptr p -+ ) -+{ -+ return PortableInterceptor::ORBInitializer::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableInterceptor_ORBInitializer_release ( -+ PortableInterceptor::ORBInitializer_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableInterceptor::ORBInitializer_ptr -+tao_PortableInterceptor_ORBInitializer_nil ( -+ void -+ ) -+{ -+ return PortableInterceptor::ORBInitializer::_nil (); -+} -+ -+ACE_INLINE PortableInterceptor::ORBInitializer_ptr -+tao_PortableInterceptor_ORBInitializer_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return PortableInterceptor::ORBInitializer::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableInterceptor_ORBInitializer_upcast ( -+ void *src -+ ) -+{ -+ PortableInterceptor::ORBInitializer **tmp = -+ ACE_static_cast (PortableInterceptor::ORBInitializer **, src); -+ return *tmp; -+} - - - #endif /* end #if !defined */ diff --git a/TAO/tao/diffs/PortableServerC.cpp.diff b/TAO/tao/diffs/PortableServerC.cpp.diff deleted file mode 100644 index 16ed9b0b2d6..00000000000 --- a/TAO/tao/diffs/PortableServerC.cpp.diff +++ /dev/null @@ -1,935 +0,0 @@ ---- PortableServerC.cpp Mon Jan 14 19:52:29 2002 -+++ PortableServerC.cpp.mod Mon Jan 14 20:00:57 2002 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -20,16 +20,9 @@ - // http://www.cs.wustl.edu/~schmidt/TAO.html - - #include "PortableServerC.h" -- --#include "tao/Stub.h" --#include "tao/Invocation.h" --#include "tao/PortableInterceptor.h" -- --#if TAO_HAS_INTERCEPTORS == 1 --#include "tao/RequestInfo_Util.h" --#include "tao/ClientRequestInfo.h" --#include "tao/ClientInterceptorAdapter.h" --#endif /* TAO_HAS_INTERCEPTORS == 1 */ -+#include "POA.h" -+#include "tao/ORB.h" -+#include "tao/ORB_Core.h" - - #if defined (__BORLANDC__) - #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig -@@ -268,6 +261,8 @@ - TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId) - TAO_NAMESPACE_END - -+#if (TAO_HAS_MINIMUM_CORBA == 0) -+ - // Default constructor. - PortableServer::ForwardRequest::ForwardRequest (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0") -@@ -428,6 +423,10 @@ - return ::PortableServer::_tc_ForwardRequest; - } - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Default constructor. - PortableServer::NotAGroupObject::NotAGroupObject (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/NotAGroupObject:1.0") -@@ -713,6 +712,8 @@ - TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IDs, &_tc_TAO_tc_PortableServer_IDs) - TAO_NAMESPACE_END - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - TAO_NAMESPACE_TYPE (const CORBA::ULong) - TAO_NAMESPACE_BEGIN (PortableServer) - TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16U) -@@ -741,6 +742,9 @@ - TAO_NAMESPACE_BEGIN (PortableServer) - TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22U) - TAO_NAMESPACE_END -+ -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order -@@ -793,49 +797,6 @@ - - int PortableServer::ThreadPolicy::_tao_class_id = 0; - --PortableServer::ThreadPolicy_ptr --tao_PortableServer_ThreadPolicy_duplicate ( -- PortableServer::ThreadPolicy_ptr p -- ) --{ -- return PortableServer::ThreadPolicy::_duplicate (p); --} -- --void --tao_PortableServer_ThreadPolicy_release ( -- PortableServer::ThreadPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::ThreadPolicy_ptr --tao_PortableServer_ThreadPolicy_nil ( -- void -- ) --{ -- return PortableServer::ThreadPolicy::_nil (); --} -- --PortableServer::ThreadPolicy_ptr --tao_PortableServer_ThreadPolicy_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_ThreadPolicy_upcast ( -- void *src -- ) --{ -- PortableServer::ThreadPolicy **tmp = -- ACE_static_cast (PortableServer::ThreadPolicy **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::ThreadPolicy_var - // ************************************************************* -@@ -1097,6 +1058,8 @@ - return "IDL:omg.org/PortableServer/ThreadPolicy:1.0"; - } - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order -@@ -1146,49 +1109,6 @@ - - int PortableServer::LifespanPolicy::_tao_class_id = 0; - --PortableServer::LifespanPolicy_ptr --tao_PortableServer_LifespanPolicy_duplicate ( -- PortableServer::LifespanPolicy_ptr p -- ) --{ -- return PortableServer::LifespanPolicy::_duplicate (p); --} -- --void --tao_PortableServer_LifespanPolicy_release ( -- PortableServer::LifespanPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::LifespanPolicy_ptr --tao_PortableServer_LifespanPolicy_nil ( -- void -- ) --{ -- return PortableServer::LifespanPolicy::_nil (); --} -- --PortableServer::LifespanPolicy_ptr --tao_PortableServer_LifespanPolicy_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_LifespanPolicy_upcast ( -- void *src -- ) --{ -- PortableServer::LifespanPolicy **tmp = -- ACE_static_cast (PortableServer::LifespanPolicy **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::LifespanPolicy_var - // ************************************************************* -@@ -1501,49 +1421,6 @@ - - int PortableServer::IdUniquenessPolicy::_tao_class_id = 0; - --PortableServer::IdUniquenessPolicy_ptr --tao_PortableServer_IdUniquenessPolicy_duplicate ( -- PortableServer::IdUniquenessPolicy_ptr p -- ) --{ -- return PortableServer::IdUniquenessPolicy::_duplicate (p); --} -- --void --tao_PortableServer_IdUniquenessPolicy_release ( -- PortableServer::IdUniquenessPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::IdUniquenessPolicy_ptr --tao_PortableServer_IdUniquenessPolicy_nil ( -- void -- ) --{ -- return PortableServer::IdUniquenessPolicy::_nil (); --} -- --PortableServer::IdUniquenessPolicy_ptr --tao_PortableServer_IdUniquenessPolicy_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_IdUniquenessPolicy_upcast ( -- void *src -- ) --{ -- PortableServer::IdUniquenessPolicy **tmp = -- ACE_static_cast (PortableServer::IdUniquenessPolicy **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::IdUniquenessPolicy_var - // ************************************************************* -@@ -1855,49 +1732,6 @@ - - int PortableServer::IdAssignmentPolicy::_tao_class_id = 0; - --PortableServer::IdAssignmentPolicy_ptr --tao_PortableServer_IdAssignmentPolicy_duplicate ( -- PortableServer::IdAssignmentPolicy_ptr p -- ) --{ -- return PortableServer::IdAssignmentPolicy::_duplicate (p); --} -- --void --tao_PortableServer_IdAssignmentPolicy_release ( -- PortableServer::IdAssignmentPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::IdAssignmentPolicy_ptr --tao_PortableServer_IdAssignmentPolicy_nil ( -- void -- ) --{ -- return PortableServer::IdAssignmentPolicy::_nil (); --} -- --PortableServer::IdAssignmentPolicy_ptr --tao_PortableServer_IdAssignmentPolicy_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_IdAssignmentPolicy_upcast ( -- void *src -- ) --{ -- PortableServer::IdAssignmentPolicy **tmp = -- ACE_static_cast (PortableServer::IdAssignmentPolicy **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::IdAssignmentPolicy_var - // ************************************************************* -@@ -2159,6 +1993,8 @@ - return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0"; - } - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order -@@ -2219,49 +2055,6 @@ - - int PortableServer::ImplicitActivationPolicy::_tao_class_id = 0; - --PortableServer::ImplicitActivationPolicy_ptr --tao_PortableServer_ImplicitActivationPolicy_duplicate ( -- PortableServer::ImplicitActivationPolicy_ptr p -- ) --{ -- return PortableServer::ImplicitActivationPolicy::_duplicate (p); --} -- --void --tao_PortableServer_ImplicitActivationPolicy_release ( -- PortableServer::ImplicitActivationPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::ImplicitActivationPolicy_ptr --tao_PortableServer_ImplicitActivationPolicy_nil ( -- void -- ) --{ -- return PortableServer::ImplicitActivationPolicy::_nil (); --} -- --PortableServer::ImplicitActivationPolicy_ptr --tao_PortableServer_ImplicitActivationPolicy_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_ImplicitActivationPolicy_upcast ( -- void *src -- ) --{ -- PortableServer::ImplicitActivationPolicy **tmp = -- ACE_static_cast (PortableServer::ImplicitActivationPolicy **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::ImplicitActivationPolicy_var - // ************************************************************* -@@ -2575,49 +2368,6 @@ - - int PortableServer::ServantRetentionPolicy::_tao_class_id = 0; - --PortableServer::ServantRetentionPolicy_ptr --tao_PortableServer_ServantRetentionPolicy_duplicate ( -- PortableServer::ServantRetentionPolicy_ptr p -- ) --{ -- return PortableServer::ServantRetentionPolicy::_duplicate (p); --} -- --void --tao_PortableServer_ServantRetentionPolicy_release ( -- PortableServer::ServantRetentionPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::ServantRetentionPolicy_ptr --tao_PortableServer_ServantRetentionPolicy_nil ( -- void -- ) --{ -- return PortableServer::ServantRetentionPolicy::_nil (); --} -- --PortableServer::ServantRetentionPolicy_ptr --tao_PortableServer_ServantRetentionPolicy_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_ServantRetentionPolicy_upcast ( -- void *src -- ) --{ -- PortableServer::ServantRetentionPolicy **tmp = -- ACE_static_cast (PortableServer::ServantRetentionPolicy **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::ServantRetentionPolicy_var - // ************************************************************* -@@ -2945,49 +2695,6 @@ - - int PortableServer::RequestProcessingPolicy::_tao_class_id = 0; - --PortableServer::RequestProcessingPolicy_ptr --tao_PortableServer_RequestProcessingPolicy_duplicate ( -- PortableServer::RequestProcessingPolicy_ptr p -- ) --{ -- return PortableServer::RequestProcessingPolicy::_duplicate (p); --} -- --void --tao_PortableServer_RequestProcessingPolicy_release ( -- PortableServer::RequestProcessingPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::RequestProcessingPolicy_ptr --tao_PortableServer_RequestProcessingPolicy_nil ( -- void -- ) --{ -- return PortableServer::RequestProcessingPolicy::_nil (); --} -- --PortableServer::RequestProcessingPolicy_ptr --tao_PortableServer_RequestProcessingPolicy_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_RequestProcessingPolicy_upcast ( -- void *src -- ) --{ -- PortableServer::RequestProcessingPolicy **tmp = -- ACE_static_cast (PortableServer::RequestProcessingPolicy **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::RequestProcessingPolicy_var - // ************************************************************* -@@ -3249,50 +2956,9 @@ - return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0"; - } - --int PortableServer::POAManager::_tao_class_id = 0; -- --PortableServer::POAManager_ptr --tao_PortableServer_POAManager_duplicate ( -- PortableServer::POAManager_ptr p -- ) --{ -- return PortableServer::POAManager::_duplicate (p); --} -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ - --void --tao_PortableServer_POAManager_release ( -- PortableServer::POAManager_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::POAManager_ptr --tao_PortableServer_POAManager_nil ( -- void -- ) --{ -- return PortableServer::POAManager::_nil (); --} -- --PortableServer::POAManager_ptr --tao_PortableServer_POAManager_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_POAManager_upcast ( -- void *src -- ) --{ -- PortableServer::POAManager **tmp = -- ACE_static_cast (PortableServer::POAManager **, src); -- return *tmp; --} -+int PortableServer::POAManager::_tao_class_id = 0; - - // ************************************************************* - // Operations for class PortableServer::POAManager_var -@@ -3611,50 +3277,9 @@ - return retval; - } - --int PortableServer::AdapterActivator::_tao_class_id = 0; -- --PortableServer::AdapterActivator_ptr --tao_PortableServer_AdapterActivator_duplicate ( -- PortableServer::AdapterActivator_ptr p -- ) --{ -- return PortableServer::AdapterActivator::_duplicate (p); --} -+#if (TAO_HAS_MINIMUM_POA == 0) - --void --tao_PortableServer_AdapterActivator_release ( -- PortableServer::AdapterActivator_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::AdapterActivator_ptr --tao_PortableServer_AdapterActivator_nil ( -- void -- ) --{ -- return PortableServer::AdapterActivator::_nil (); --} -- --PortableServer::AdapterActivator_ptr --tao_PortableServer_AdapterActivator_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_AdapterActivator_upcast ( -- void *src -- ) --{ -- PortableServer::AdapterActivator **tmp = -- ACE_static_cast (PortableServer::AdapterActivator **, src); -- return *tmp; --} -+int PortableServer::AdapterActivator::_tao_class_id = 0; - - // ************************************************************* - // Operations for class PortableServer::AdapterActivator_var -@@ -3907,49 +3532,6 @@ - - int PortableServer::ServantManager::_tao_class_id = 0; - --PortableServer::ServantManager_ptr --tao_PortableServer_ServantManager_duplicate ( -- PortableServer::ServantManager_ptr p -- ) --{ -- return PortableServer::ServantManager::_duplicate (p); --} -- --void --tao_PortableServer_ServantManager_release ( -- PortableServer::ServantManager_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::ServantManager_ptr --tao_PortableServer_ServantManager_nil ( -- void -- ) --{ -- return PortableServer::ServantManager::_nil (); --} -- --PortableServer::ServantManager_ptr --tao_PortableServer_ServantManager_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_ServantManager_upcast ( -- void *src -- ) --{ -- PortableServer::ServantManager **tmp = -- ACE_static_cast (PortableServer::ServantManager **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::ServantManager_var - // ************************************************************* -@@ -4201,49 +3783,6 @@ - - int PortableServer::ServantActivator::_tao_class_id = 0; - --PortableServer::ServantActivator_ptr --tao_PortableServer_ServantActivator_duplicate ( -- PortableServer::ServantActivator_ptr p -- ) --{ -- return PortableServer::ServantActivator::_duplicate (p); --} -- --void --tao_PortableServer_ServantActivator_release ( -- PortableServer::ServantActivator_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::ServantActivator_ptr --tao_PortableServer_ServantActivator_nil ( -- void -- ) --{ -- return PortableServer::ServantActivator::_nil (); --} -- --PortableServer::ServantActivator_ptr --tao_PortableServer_ServantActivator_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_ServantActivator_upcast ( -- void *src -- ) --{ -- PortableServer::ServantActivator **tmp = -- ACE_static_cast (PortableServer::ServantActivator **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::ServantActivator_var - // ************************************************************* -@@ -4507,49 +4046,6 @@ - - int PortableServer::ServantLocator::_tao_class_id = 0; - --PortableServer::ServantLocator_ptr --tao_PortableServer_ServantLocator_duplicate ( -- PortableServer::ServantLocator_ptr p -- ) --{ -- return PortableServer::ServantLocator::_duplicate (p); --} -- --void --tao_PortableServer_ServantLocator_release ( -- PortableServer::ServantLocator_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::ServantLocator_ptr --tao_PortableServer_ServantLocator_nil ( -- void -- ) --{ -- return PortableServer::ServantLocator::_nil (); --} -- --PortableServer::ServantLocator_ptr --tao_PortableServer_ServantLocator_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_ServantLocator_upcast ( -- void *src -- ) --{ -- PortableServer::ServantLocator **tmp = -- ACE_static_cast (PortableServer::ServantLocator **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::ServantLocator_var - // ************************************************************* -@@ -4811,50 +4307,9 @@ - return "IDL:omg.org/PortableServer/ServantLocator:2.3"; - } - --int PortableServer::POA::_tao_class_id = 0; -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ - --PortableServer::POA_ptr --tao_PortableServer_POA_duplicate ( -- PortableServer::POA_ptr p -- ) --{ -- return PortableServer::POA::_duplicate (p); --} -- --void --tao_PortableServer_POA_release ( -- PortableServer::POA_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::POA_ptr --tao_PortableServer_POA_nil ( -- void -- ) --{ -- return PortableServer::POA::_nil (); --} -- --PortableServer::POA_ptr --tao_PortableServer_POA_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_POA_upcast ( -- void *src -- ) --{ -- PortableServer::POA **tmp = -- ACE_static_cast (PortableServer::POA **, src); -- return *tmp; --} -+int PortableServer::POA::_tao_class_id = 0; - - // ************************************************************* - // Operations for class PortableServer::POA_var -@@ -5319,6 +4774,8 @@ - this->index = _tao_index; - } - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Default constructor. - PortableServer::POA::NoServant::NoServant (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/NoServant:1.0") -@@ -5387,6 +4844,8 @@ - return retval; - } - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - // Default constructor. - PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0") -@@ -5797,49 +5256,6 @@ - - int PortableServer::Current::_tao_class_id = 0; - --PortableServer::Current_ptr --tao_PortableServer_Current_duplicate ( -- PortableServer::Current_ptr p -- ) --{ -- return PortableServer::Current::_duplicate (p); --} -- --void --tao_PortableServer_Current_release ( -- PortableServer::Current_ptr p -- ) --{ -- CORBA::release (p); --} -- --PortableServer::Current_ptr --tao_PortableServer_Current_nil ( -- void -- ) --{ -- return PortableServer::Current::_nil (); --} -- --PortableServer::Current_ptr --tao_PortableServer_Current_narrow ( -- CORBA::Object *p -- TAO_ENV_ARG_DECL -- ) --{ -- return PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER); --} -- --CORBA::Object * --tao_PortableServer_Current_upcast ( -- void *src -- ) --{ -- PortableServer::Current **tmp = -- ACE_static_cast (PortableServer::Current **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class PortableServer::Current_var - // ************************************************************* -@@ -6169,6 +5585,30 @@ - return retval; - } - -+char * -+PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id) -+{ -+ return TAO_POA::ObjectId_to_string (id); -+} -+ -+CORBA::WChar * -+PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id) -+{ -+ return TAO_POA::ObjectId_to_wstring (id); -+} -+ -+PortableServer::ObjectId * -+PortableServer::string_to_ObjectId (const char *id) -+{ -+ return TAO_POA::string_to_ObjectId (id); -+} -+ -+PortableServer::ObjectId * -+PortableServer::wstring_to_ObjectId (const CORBA::WChar *id) -+{ -+ return TAO_POA::wstring_to_ObjectId (id); -+} -+ - void operator<<= ( - CORBA::Any &_tao_any, - const PortableServer::ObjectId &_tao_elem -@@ -6260,6 +5700,8 @@ - return 0; - } - -+#if (TAO_HAS_MINIMUM_CORBA == 0) -+ - void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying - { - TAO_OutputCDR stream; -@@ -6350,6 +5792,10 @@ - return 0; - } - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying - { - TAO_OutputCDR stream; -@@ -6531,6 +5977,10 @@ - return 0; - } - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - void operator<<= (CORBA::Any &_tao_any, PortableServer::ThreadPolicyValue _tao_elem) - { - TAO_OutputCDR stream; -@@ -6578,6 +6028,8 @@ - # pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue _tao_elem) - { - TAO_OutputCDR stream; -@@ -6719,6 +6171,8 @@ - # pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue _tao_elem) - { - TAO_OutputCDR stream; -@@ -6860,6 +6314,8 @@ - # pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>; -@@ -6867,6 +6323,8 @@ - # pragma instantiate TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>; -@@ -6895,6 +6353,8 @@ - # pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>; -@@ -6982,6 +6442,8 @@ - return 0; // error - } - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const PortableServer::IDs &_tao_sequence -@@ -7029,3 +6491,4 @@ - return 0; // error - } - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/diffs/PortableServerC.i.diff b/TAO/tao/diffs/PortableServerC.i.diff deleted file mode 100644 index 6c5ed5822e8..00000000000 --- a/TAO/tao/diffs/PortableServerC.i.diff +++ /dev/null @@ -1,783 +0,0 @@ ---- PortableServerC.i Mon Jan 14 19:52:29 2002 -+++ PortableServerC.i.mod Mon Jan 14 18:55:27 2002 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -627,6 +627,8 @@ - // Inline operations for exception PortableServer::ForwardRequest - // ************************************************************* - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // ************************************************************* - // Inline operations for exception PortableServer::NotAGroupObject - // ************************************************************* -@@ -1025,17 +1027,107 @@ - - #endif /* end #if !defined */ - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ -+ -+#if (TAO_HAS_MINIMUM_POA == 0) - - #if !defined (_PORTABLESERVER_THREADPOLICY___CI_) - #define _PORTABLESERVER_THREADPOLICY___CI_ - -+ACE_INLINE PortableServer::ThreadPolicy_ptr -+tao_PortableServer_ThreadPolicy_duplicate ( -+ PortableServer::ThreadPolicy_ptr p -+ ) -+{ -+ return PortableServer::ThreadPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_ThreadPolicy_release ( -+ PortableServer::ThreadPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::ThreadPolicy_ptr -+tao_PortableServer_ThreadPolicy_nil ( -+ void -+ ) -+{ -+ return PortableServer::ThreadPolicy::_nil (); -+} -+ -+ACE_INLINE PortableServer::ThreadPolicy_ptr -+tao_PortableServer_ThreadPolicy_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_ThreadPolicy_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::ThreadPolicy **tmp = -+ ACE_static_cast (PortableServer::ThreadPolicy **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - #if !defined (_PORTABLESERVER_LIFESPANPOLICY___CI_) - #define _PORTABLESERVER_LIFESPANPOLICY___CI_ - -+ACE_INLINE PortableServer::LifespanPolicy_ptr -+tao_PortableServer_LifespanPolicy_duplicate ( -+ PortableServer::LifespanPolicy_ptr p -+ ) -+{ -+ return PortableServer::LifespanPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_LifespanPolicy_release ( -+ PortableServer::LifespanPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::LifespanPolicy_ptr -+tao_PortableServer_LifespanPolicy_nil ( -+ void -+ ) -+{ -+ return PortableServer::LifespanPolicy::_nil (); -+} -+ -+ACE_INLINE PortableServer::LifespanPolicy_ptr -+tao_PortableServer_LifespanPolicy_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_LifespanPolicy_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::LifespanPolicy **tmp = -+ ACE_static_cast (PortableServer::LifespanPolicy **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1043,6 +1135,48 @@ - #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___CI_) - #define _PORTABLESERVER_IDUNIQUENESSPOLICY___CI_ - -+ACE_INLINE PortableServer::IdUniquenessPolicy_ptr -+tao_PortableServer_IdUniquenessPolicy_duplicate ( -+ PortableServer::IdUniquenessPolicy_ptr p -+ ) -+{ -+ return PortableServer::IdUniquenessPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_IdUniquenessPolicy_release ( -+ PortableServer::IdUniquenessPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::IdUniquenessPolicy_ptr -+tao_PortableServer_IdUniquenessPolicy_nil ( -+ void -+ ) -+{ -+ return PortableServer::IdUniquenessPolicy::_nil (); -+} -+ -+ACE_INLINE PortableServer::IdUniquenessPolicy_ptr -+tao_PortableServer_IdUniquenessPolicy_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_IdUniquenessPolicy_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::IdUniquenessPolicy **tmp = -+ ACE_static_cast (PortableServer::IdUniquenessPolicy **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1050,13 +1184,99 @@ - #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___CI_) - #define _PORTABLESERVER_IDASSIGNMENTPOLICY___CI_ - -+ACE_INLINE PortableServer::IdAssignmentPolicy_ptr -+tao_PortableServer_IdAssignmentPolicy_duplicate ( -+ PortableServer::IdAssignmentPolicy_ptr p -+ ) -+{ -+ return PortableServer::IdAssignmentPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_IdAssignmentPolicy_release ( -+ PortableServer::IdAssignmentPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::IdAssignmentPolicy_ptr -+tao_PortableServer_IdAssignmentPolicy_nil ( -+ void -+ ) -+{ -+ return PortableServer::IdAssignmentPolicy::_nil (); -+} -+ -+ACE_INLINE PortableServer::IdAssignmentPolicy_ptr -+tao_PortableServer_IdAssignmentPolicy_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_IdAssignmentPolicy_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::IdAssignmentPolicy **tmp = -+ ACE_static_cast (PortableServer::IdAssignmentPolicy **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_) - #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_ - -+ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr -+tao_PortableServer_ImplicitActivationPolicy_duplicate ( -+ PortableServer::ImplicitActivationPolicy_ptr p -+ ) -+{ -+ return PortableServer::ImplicitActivationPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_ImplicitActivationPolicy_release ( -+ PortableServer::ImplicitActivationPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr -+tao_PortableServer_ImplicitActivationPolicy_nil ( -+ void -+ ) -+{ -+ return PortableServer::ImplicitActivationPolicy::_nil (); -+} -+ -+ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr -+tao_PortableServer_ImplicitActivationPolicy_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_ImplicitActivationPolicy_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::ImplicitActivationPolicy **tmp = -+ ACE_static_cast (PortableServer::ImplicitActivationPolicy **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1064,6 +1284,48 @@ - #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_) - #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_ - -+ACE_INLINE PortableServer::ServantRetentionPolicy_ptr -+tao_PortableServer_ServantRetentionPolicy_duplicate ( -+ PortableServer::ServantRetentionPolicy_ptr p -+ ) -+{ -+ return PortableServer::ServantRetentionPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_ServantRetentionPolicy_release ( -+ PortableServer::ServantRetentionPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::ServantRetentionPolicy_ptr -+tao_PortableServer_ServantRetentionPolicy_nil ( -+ void -+ ) -+{ -+ return PortableServer::ServantRetentionPolicy::_nil (); -+} -+ -+ACE_INLINE PortableServer::ServantRetentionPolicy_ptr -+tao_PortableServer_ServantRetentionPolicy_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_ServantRetentionPolicy_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::ServantRetentionPolicy **tmp = -+ ACE_static_cast (PortableServer::ServantRetentionPolicy **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1071,9 +1333,53 @@ - #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_) - #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_ - -+ACE_INLINE PortableServer::RequestProcessingPolicy_ptr -+tao_PortableServer_RequestProcessingPolicy_duplicate ( -+ PortableServer::RequestProcessingPolicy_ptr p -+ ) -+{ -+ return PortableServer::RequestProcessingPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_RequestProcessingPolicy_release ( -+ PortableServer::RequestProcessingPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::RequestProcessingPolicy_ptr -+tao_PortableServer_RequestProcessingPolicy_nil ( -+ void -+ ) -+{ -+ return PortableServer::RequestProcessingPolicy::_nil (); -+} -+ -+ACE_INLINE PortableServer::RequestProcessingPolicy_ptr -+tao_PortableServer_RequestProcessingPolicy_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_RequestProcessingPolicy_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::RequestProcessingPolicy **tmp = -+ ACE_static_cast (PortableServer::RequestProcessingPolicy **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - // ************************************************************* - // Inline operations for exception PortableServer::POAManager::AdapterInactive - // ************************************************************* -@@ -1082,13 +1388,99 @@ - #if !defined (_PORTABLESERVER_POAMANAGER___CI_) - #define _PORTABLESERVER_POAMANAGER___CI_ - -+ACE_INLINE PortableServer::POAManager_ptr -+tao_PortableServer_POAManager_duplicate ( -+ PortableServer::POAManager_ptr p -+ ) -+{ -+ return PortableServer::POAManager::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_POAManager_release ( -+ PortableServer::POAManager_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::POAManager_ptr -+tao_PortableServer_POAManager_nil ( -+ void -+ ) -+{ -+ return PortableServer::POAManager::_nil (); -+} -+ -+ACE_INLINE PortableServer::POAManager_ptr -+tao_PortableServer_POAManager_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_POAManager_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::POAManager **tmp = -+ ACE_static_cast (PortableServer::POAManager **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___CI_) - #define _PORTABLESERVER_ADAPTERACTIVATOR___CI_ - -+ACE_INLINE PortableServer::AdapterActivator_ptr -+tao_PortableServer_AdapterActivator_duplicate ( -+ PortableServer::AdapterActivator_ptr p -+ ) -+{ -+ return PortableServer::AdapterActivator::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_AdapterActivator_release ( -+ PortableServer::AdapterActivator_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::AdapterActivator_ptr -+tao_PortableServer_AdapterActivator_nil ( -+ void -+ ) -+{ -+ return PortableServer::AdapterActivator::_nil (); -+} -+ -+ACE_INLINE PortableServer::AdapterActivator_ptr -+tao_PortableServer_AdapterActivator_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_AdapterActivator_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::AdapterActivator **tmp = -+ ACE_static_cast (PortableServer::AdapterActivator **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1096,6 +1488,48 @@ - #if !defined (_PORTABLESERVER_SERVANTMANAGER___CI_) - #define _PORTABLESERVER_SERVANTMANAGER___CI_ - -+ACE_INLINE PortableServer::ServantManager_ptr -+tao_PortableServer_ServantManager_duplicate ( -+ PortableServer::ServantManager_ptr p -+ ) -+{ -+ return PortableServer::ServantManager::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_ServantManager_release ( -+ PortableServer::ServantManager_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::ServantManager_ptr -+tao_PortableServer_ServantManager_nil ( -+ void -+ ) -+{ -+ return PortableServer::ServantManager::_nil (); -+} -+ -+ACE_INLINE PortableServer::ServantManager_ptr -+tao_PortableServer_ServantManager_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_ServantManager_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::ServantManager **tmp = -+ ACE_static_cast (PortableServer::ServantManager **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1103,6 +1537,48 @@ - #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___CI_) - #define _PORTABLESERVER_SERVANTACTIVATOR___CI_ - -+ACE_INLINE PortableServer::ServantActivator_ptr -+tao_PortableServer_ServantActivator_duplicate ( -+ PortableServer::ServantActivator_ptr p -+ ) -+{ -+ return PortableServer::ServantActivator::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_ServantActivator_release ( -+ PortableServer::ServantActivator_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::ServantActivator_ptr -+tao_PortableServer_ServantActivator_nil ( -+ void -+ ) -+{ -+ return PortableServer::ServantActivator::_nil (); -+} -+ -+ACE_INLINE PortableServer::ServantActivator_ptr -+tao_PortableServer_ServantActivator_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_ServantActivator_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::ServantActivator **tmp = -+ ACE_static_cast (PortableServer::ServantActivator **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1110,9 +1586,53 @@ - #if !defined (_PORTABLESERVER_SERVANTLOCATOR___CI_) - #define _PORTABLESERVER_SERVANTLOCATOR___CI_ - -+ACE_INLINE PortableServer::ServantLocator_ptr -+tao_PortableServer_ServantLocator_duplicate ( -+ PortableServer::ServantLocator_ptr p -+ ) -+{ -+ return PortableServer::ServantLocator::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_ServantLocator_release ( -+ PortableServer::ServantLocator_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::ServantLocator_ptr -+tao_PortableServer_ServantLocator_nil ( -+ void -+ ) -+{ -+ return PortableServer::ServantLocator::_nil (); -+} -+ -+ACE_INLINE PortableServer::ServantLocator_ptr -+tao_PortableServer_ServantLocator_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_ServantLocator_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::ServantLocator **tmp = -+ ACE_static_cast (PortableServer::ServantLocator **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - // ************************************************************* - // Inline operations for exception PortableServer::POA::AdapterAlreadyExists - // ************************************************************* -@@ -1157,6 +1677,48 @@ - #if !defined (_PORTABLESERVER_POA___CI_) - #define _PORTABLESERVER_POA___CI_ - -+ACE_INLINE PortableServer::POA_ptr -+tao_PortableServer_POA_duplicate ( -+ PortableServer::POA_ptr p -+ ) -+{ -+ return PortableServer::POA::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_POA_release ( -+ PortableServer::POA_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::POA_ptr -+tao_PortableServer_POA_nil ( -+ void -+ ) -+{ -+ return PortableServer::POA::_nil (); -+} -+ -+ACE_INLINE PortableServer::POA_ptr -+tao_PortableServer_POA_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_POA_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::POA **tmp = -+ ACE_static_cast (PortableServer::POA **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1168,6 +1730,48 @@ - #if !defined (_PORTABLESERVER_CURRENT___CI_) - #define _PORTABLESERVER_CURRENT___CI_ - -+ACE_INLINE PortableServer::Current_ptr -+tao_PortableServer_Current_duplicate ( -+ PortableServer::Current_ptr p -+ ) -+{ -+ return PortableServer::Current::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_PortableServer_Current_release ( -+ PortableServer::Current_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE PortableServer::Current_ptr -+tao_PortableServer_Current_nil ( -+ void -+ ) -+{ -+ return PortableServer::Current::_nil (); -+} -+ -+ACE_INLINE PortableServer::Current_ptr -+tao_PortableServer_Current_narrow ( -+ CORBA::Object *p TAO_ENV_ARG_DECL -+ ) -+{ -+ return PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_PortableServer_Current_upcast ( -+ void *src -+ ) -+{ -+ PortableServer::Current **tmp = -+ ACE_static_cast (PortableServer::Current **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -1186,6 +1790,8 @@ - - #endif /* _TAO_CDR_OP_PortableServer_ObjectId_I_ */ - -+#if (TAO_HAS_MINIMUM_CORBA == 0) -+ - ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate) - { - // first marshal the repository ID -@@ -1214,6 +1820,10 @@ - return 0; - } - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate) - { - // first marshal the repository ID -@@ -1243,6 +1853,10 @@ - - #endif /* _TAO_CDR_OP_PortableServer_IDs_I_ */ - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval) - { - CORBA::ULong _tao_temp = _tao_enumval; -@@ -1262,6 +1876,8 @@ - return _tao_result; - } - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval) - { - CORBA::ULong _tao_temp = _tao_enumval; -@@ -1319,6 +1935,8 @@ - return _tao_result; - } - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval) - { - CORBA::ULong _tao_temp = _tao_enumval; -@@ -1376,3 +1994,4 @@ - return _tao_result; - } - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/diffs/WrongTransaction.diff b/TAO/tao/diffs/WrongTransaction.diff new file mode 100644 index 00000000000..5ef1f159509 --- /dev/null +++ b/TAO/tao/diffs/WrongTransaction.diff @@ -0,0 +1,41 @@ +--- orig/WrongTransactionC.h Mon Feb 4 15:45:55 2002 ++++ WrongTransactionC.h Mon Feb 4 15:56:28 2002 +@@ -23,7 +23,12 @@ + #define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" ++ ++#if (TAO_HAS_MINIMUM_CORBA == 0) ++ ++#include "tao/Exception.h" ++#include "tao/CDR.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once +@@ -127,6 +132,8 @@ + #if defined (__BORLANDC__) + #pragma option pop + #endif /* __BORLANDC__ */ ++ ++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + + #include "ace/post.h" + #endif /* ifndef */ +--- orig/WrongTransactionC.cpp Mon Feb 4 15:45:55 2002 ++++ WrongTransactionC.cpp Mon Feb 4 15:56:45 2002 +@@ -21,6 +21,8 @@ + + #include "WrongTransactionC.h" + ++#if (TAO_HAS_MINIMUM_CORBA == 0) ++ + #include "tao/Stub.h" + #include "tao/Invocation.h" + #include "tao/PortableInterceptor.h" +@@ -266,3 +268,4 @@ + return 0; + } + ++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ |