diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/tao/TAOC.cpp | 394 | ||||
| -rw-r--r-- | TAO/tao/TAOC.h | 96 | ||||
| -rw-r--r-- | TAO/tao/TAOC.i | 73 | ||||
| -rw-r--r-- | TAO/tao/diffs/TAOC.cpp.diff | 170 | ||||
| -rw-r--r-- | TAO/tao/diffs/TAOC.h.diff | 157 | ||||
| -rw-r--r-- | TAO/tao/diffs/TAOC.i.diff | 98 |
7 files changed, 397 insertions, 602 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 27cdb0e58d3..7ce49aa9fc8 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Wed Apr 17 11:21:52 2002 Ossama Othman <ossama@uci.edu> + + * tao/TAOC.cpp: + * tao/TAOC.h: + * tao/TAOC.i: + * tao/diffs/TAOC.cpp.diff: + * tao/diffs/TAOC.h.diff: + * tao/diffs/TAOC.i.diff: + + Regenerated these files. + Wed Apr 17 11:15:23 2002 Ossama Othman <ossama@uci.edu> * tao/Messaging/Messaging.h: diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 185110e2394..5e98a3a4b5c 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -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,20 +21,23 @@ #include "TAOC.h" -#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) #if !defined (__ACE_INLINE__) #include "TAOC.i" #endif /* !defined INLINE */ - -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - static const CORBA::Long _oc_TAO_BufferingConstraintMode[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 36, + 40, ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), @@ -42,7 +45,7 @@ static const CORBA::Long _oc_TAO_BufferingConstraintMode[] = ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e744d), ACE_NTOHL (0x6f64653a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:TAO/BufferingConstraintMode:1.0 + ACE_NTOHL (0x312e3000), // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0 24, ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), @@ -64,7 +67,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraintMode, &_tc_TAO_tc_TAO_BufferingConstraintMode) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraintMode, &_tc_TAO_tc_TAO_BufferingConstraintMode) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::UShort) @@ -86,15 +89,16 @@ TAO_NAMESPACE_END static const CORBA::Long _oc_TAO_BufferingConstraint[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 32, + 36, ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e743a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:TAO/BufferingConstraint:1.0 + ACE_NTOHL (0x312e3000), // repository ID = IDL:tao/TAO/BufferingConstraint:1.0 20, ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), @@ -106,10 +110,11 @@ static const CORBA::Long _oc_TAO_BufferingConstraint[] = ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode CORBA::tk_alias, // typecode kind for typedefs - 76, // encapsulation length + 80, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 36, + 40, ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), @@ -117,7 +122,7 @@ static const CORBA::Long _oc_TAO_BufferingConstraint[] = ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e744d), ACE_NTOHL (0x6f64653a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:TAO/BufferingConstraintMode:1.0 + ACE_NTOHL (0x312e3000), // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0 24, ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), @@ -175,12 +180,12 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint ( TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraint, &_tc_TAO_tc_TAO_BufferingConstraint) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraint, &_tc_TAO_tc_TAO_BufferingConstraint) TAO_NAMESPACE_END -void TAO::BufferingConstraint::_tao_any_destructor (void *x) +void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer) { - BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*,x); + BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*, _tao_void_pointer); delete tmp; } @@ -189,10 +194,58 @@ TAO_NAMESPACE_BEGIN (TAO) TAO_NAMESPACE_DEFINE (const CORBA::ULong, BUFFERING_CONSTRAINT_POLICY_TYPE, 1413545985U) TAO_NAMESPACE_END +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:67 + int TAO::BufferingConstraintPolicy::_tao_class_id = 0; +TAO::BufferingConstraintPolicy_ptr +tao_TAO_BufferingConstraintPolicy_duplicate ( + TAO::BufferingConstraintPolicy_ptr p + ) +{ + return TAO::BufferingConstraintPolicy::_duplicate (p); +} + +void +tao_TAO_BufferingConstraintPolicy_release ( + TAO::BufferingConstraintPolicy_ptr p + ) +{ + CORBA::release (p); +} + +TAO::BufferingConstraintPolicy_ptr +tao_TAO_BufferingConstraintPolicy_nil ( + void + ) +{ + return TAO::BufferingConstraintPolicy::_nil (); +} + +TAO::BufferingConstraintPolicy_ptr +tao_TAO_BufferingConstraintPolicy_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +tao_TAO_BufferingConstraintPolicy_upcast ( + void *src + ) +{ + TAO::BufferingConstraintPolicy **tmp = + ACE_static_cast (TAO::BufferingConstraintPolicy **, src); + return *tmp; +} + // ************************************************************* -// Operations for class TAO::BufferingConstraintPolicy_var +// TAO::BufferingConstraintPolicy_var +// TAO_IDL - Generated from +// be/be_interface.cpp:654 // ************************************************************* TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void) // default constructor @@ -313,8 +366,11 @@ TAO::BufferingConstraintPolicy_var::tao_upcast (void *src) ACE_static_cast (BufferingConstraintPolicy **, src); return *tmp; } + // ************************************************************* -// Inline operations for class TAO::BufferingConstraintPolicy_out +// TAO::BufferingConstraintPolicy_out +// TAO_IDL - Generated from +// be/be_interface.cpp:932 // ************************************************************* TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p) @@ -373,15 +429,21 @@ TAO::BufferingConstraintPolicy_out::operator-> (void) } -// default constructor -TAO::BufferingConstraintPolicy::BufferingConstraintPolicy () -{ - } +// TAO_IDL - Generated from +// be/be_visitor_interface/interface_cs.cpp:198 + +TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) +{} -// destructor TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) {} +void TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer) +{ + BufferingConstraintPolicy *tmp = ACE_static_cast (BufferingConstraintPolicy*, _tao_void_pointer); + CORBA::release (tmp); +} + TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL @@ -390,7 +452,8 @@ TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow ( return BufferingConstraintPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_unchecked_narrow ( +TAO::BufferingConstraintPolicy_ptr +TAO::BufferingConstraintPolicy::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED ) @@ -425,11 +488,11 @@ void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type) void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &BufferingConstraintPolicy::_tao_class_id)) + &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_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 *, @@ -450,58 +513,49 @@ void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type) const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) const { - return "IDL:TAO/BufferingConstraintPolicy:1.0"; + return "IDL:tao/TAO/BufferingConstraintPolicy:1.0"; } -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - -static const CORBA::Long _oc_TAO_SyncScope[] = +static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 22, + 42, ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), ACE_NTOHL (0x54414f2f), - ACE_NTOHL (0x53796e63), - ACE_NTOHL (0x53636f70), - ACE_NTOHL (0x653a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:TAO/SyncScope:1.0 - 10, - ACE_NTOHL (0x53796e63), - ACE_NTOHL (0x53636f70), - ACE_NTOHL (0x65000000), // name = SyncScope - CORBA::tk_short, - + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e7450), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x793a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0 + 26, + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e7450), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x79000000), // name = BufferingConstraintPolicy }; -static CORBA::TypeCode _tc_TAO_tc_TAO_SyncScope ( - CORBA::tk_alias, - sizeof (_oc_TAO_SyncScope), - (char *) &_oc_TAO_SyncScope, +static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy ( + CORBA::tk_objref, + sizeof (_oc_TAO_BufferingConstraintPolicy), + (char *) &_oc_TAO_BufferingConstraintPolicy, 0, - sizeof (TAO::SyncScope) + sizeof (TAO::BufferingConstraintPolicy) ); TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScope, &_tc_TAO_tc_TAO_SyncScope) +TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraintPolicy, &_tc_TAO_tc_TAO_BufferingConstraintPolicy) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TRANSPORT, 1) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_SERVER, 2) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3) -TAO_NAMESPACE_END +#endif (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) + TAO_NAMESPACE_TYPE (const CORBA::Short) TAO_NAMESPACE_BEGIN (TAO) TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_EAGER_BUFFERING, 0) @@ -511,92 +565,206 @@ TAO_NAMESPACE_BEGIN (TAO) TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -2) TAO_NAMESPACE_END - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) -void operator<<= (CORBA::Any &_tao_any, const TAO::BufferingConstraint &_tao_elem) // copying +// TAO_IDL - Generated from +// be/be_visitor_structure/any_op_cs.cpp:58 + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const TAO::BufferingConstraint &_tao_elem + ) { TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - TAO::_tc_BufferingConstraint, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); + + if (stream << _tao_elem) + { + _tao_any._tao_replace ( + TAO::_tc_BufferingConstraint, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); + } } -void operator<<= (CORBA::Any &_tao_any, TAO::BufferingConstraint *_tao_elem) // non copying +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + TAO::BufferingConstraint *_tao_elem + ) { TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - TAO::_tc_BufferingConstraint, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - TAO::BufferingConstraint::_tao_any_destructor - ); + + if (stream << *_tao_elem) + { + _tao_any._tao_replace ( + TAO::_tc_BufferingConstraint, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + TAO::BufferingConstraint::_tao_any_destructor + ); + } } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::BufferingConstraint *&_tao_elem) +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + TAO::BufferingConstraint *&_tao_elem + ) { - return _tao_any >>= ACE_const_cast(const TAO::BufferingConstraint*&,_tao_elem); + return _tao_any >>= ACE_const_cast ( + const TAO::BufferingConstraint *&, + _tao_elem + ); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::BufferingConstraint *&_tao_elem) +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const TAO::BufferingConstraint *&_tao_elem + ) { _tao_elem = 0; + ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); + CORBA::Boolean result = - type->equivalent (TAO::_tc_BufferingConstraint ACE_ENV_ARG_PARAMETER); + type->equivalent ( + TAO::_tc_BufferingConstraint + ACE_ENV_ARG_PARAMETER + ); ACE_TRY_CHECK; - if (!result) + if (result == 0) { - return 0; + return 0; // not equivalent } if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const TAO::BufferingConstraint*, - _tao_any.value () - ); - return 1; - } - else - { - TAO::BufferingConstraint *tmp; - ACE_NEW_RETURN (tmp, TAO::BufferingConstraint, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - TAO::_tc_BufferingConstraint, - 1, - ACE_static_cast (void *, tmp), - TAO::BufferingConstraint::_tao_any_destructor + _tao_elem = ACE_static_cast ( + const TAO::BufferingConstraint*, + _tao_any.value () ); - _tao_elem = tmp; + return 1; } - else + else { - delete tmp; + TAO::BufferingConstraint *tmp; + ACE_NEW_RETURN ( + tmp, + TAO::BufferingConstraint, + 0 + ); + + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () + ); + + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( + TAO::_tc_BufferingConstraint, + 1, + ACE_static_cast (void *, tmp), + TAO::BufferingConstraint::_tao_any_destructor + ); + + _tao_elem = tmp; + return 1; + } + else + { + delete tmp; + } } - } } ACE_CATCHANY { } ACE_ENDTRY; + + return 0; +} + + +// TAO_IDL - Generated from +// be/be_visitor_interface/any_op_cs.cpp:60 + +void operator<<= ( + CORBA::Any &_tao_any, + TAO::BufferingConstraintPolicy_ptr _tao_elem + ) +{ + _tao_any._tao_replace ( + TAO::_tc_BufferingConstraintPolicy, + 1, + TAO::BufferingConstraintPolicy::_duplicate (_tao_elem), + TAO::BufferingConstraintPolicy::_tao_any_destructor + ); + + _tao_any.contains_local (1); +} + +void operator<<= ( + CORBA::Any &_tao_any, + TAO::BufferingConstraintPolicy_ptr *_tao_elem + ) +{ + _tao_any._tao_replace ( + TAO::_tc_BufferingConstraintPolicy, + 1, + *_tao_elem, + TAO::BufferingConstraintPolicy::_tao_any_destructor + ); + + _tao_any.contains_local (1); +} + +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + TAO::BufferingConstraintPolicy_ptr &_tao_elem + ) +{ + ACE_TRY_NEW_ENV + { + _tao_elem = TAO::BufferingConstraintPolicy::_nil (); + CORBA::TypeCode_var type = _tao_any.type (); + + CORBA::Boolean result = + type->equivalent ( + TAO::_tc_BufferingConstraintPolicy + ACE_ENV_ARG_PARAMETER + ); + ACE_TRY_CHECK; + + if (!result) + { + return 0; // not equivalent + } + + _tao_elem = + ACE_reinterpret_cast ( + TAO::BufferingConstraintPolicy_ptr, + ACE_const_cast (void *, _tao_any.value ()) + ); + + return 1; + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + + _tao_elem = TAO::BufferingConstraintPolicy::_nil (); return 0; } -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ +#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 18971c54055..69342793564 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id$ Id: TAOC.h,v 1.24 2000/06/28 03:47:12 marina Exp $ */ +// $Id$ // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: @@ -19,15 +19,9 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// ****** 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_ORIG_TAOC_H_ #define _TAO_IDL_ORIG_TAOC_H_ + #include "ace/pre.h" #include "tao/corbafwd.h" @@ -36,12 +30,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - -#include "tao/PolicyC.h" -#include "tao/TimeBaseC.h" - -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ +#include "PolicyC.h" +#include "TimeBaseC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -68,12 +58,11 @@ TAO_NAMESPACE TAO { - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) typedef CORBA::UShort BufferingConstraintMode; typedef CORBA::UShort_out BufferingConstraintMode_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode; TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_FLUSH; @@ -99,20 +88,23 @@ TAO_NAMESPACE TAO TimeBase::TimeT timeout; CORBA::ULong message_count; CORBA::ULong message_bytes; + }; class TAO_Export BufferingConstraint_var { public: - BufferingConstraint_var (void); // default constructor + BufferingConstraint_var (void); BufferingConstraint_var (BufferingConstraint *); - BufferingConstraint_var (const BufferingConstraint_var &); // copy constructor - BufferingConstraint_var (const BufferingConstraint &); // fixed-size types only - ~BufferingConstraint_var (void); // destructor + BufferingConstraint_var (const BufferingConstraint_var &); + // Fixed-size types only. + BufferingConstraint_var (const BufferingConstraint &); + ~BufferingConstraint_var (void); BufferingConstraint_var &operator= (BufferingConstraint *); BufferingConstraint_var &operator= (const BufferingConstraint_var &); - BufferingConstraint_var &operator= (const BufferingConstraint &); // fixed-size types only + // Fixed-size types only. + BufferingConstraint_var &operator= (const BufferingConstraint &); BufferingConstraint *operator-> (void); const BufferingConstraint *operator-> (void) const; @@ -133,7 +125,7 @@ TAO_NAMESPACE TAO typedef BufferingConstraint &BufferingConstraint_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraint; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BUFFERING_CONSTRAINT_POLICY_TYPE; @@ -176,7 +168,10 @@ TAO_NAMESPACE TAO static BufferingConstraintPolicy_ptr tao_duplicate (BufferingConstraintPolicy_ptr); static void tao_release (BufferingConstraintPolicy_ptr); static BufferingConstraintPolicy_ptr tao_nil (void); - static BufferingConstraintPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); + static BufferingConstraintPolicy_ptr tao_narrow ( + CORBA::Object * + ACE_ENV_ARG_DECL_NOT_USED + ); static CORBA::Object * tao_upcast (void *); private: @@ -213,11 +208,18 @@ TAO_NAMESPACE TAO #endif /* end #if !defined */ + // ************************************************************* + // TAO::BufferingConstraintPolicy + // TAO_IDL - Generated from + // be/be_visitor_interface/interface_ch.cpp:106 + // ************************************************************* + #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_ -class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy + class TAO_Export BufferingConstraintPolicy + : public virtual CORBA::Policy { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -225,26 +227,32 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy typedef BufferingConstraintPolicy_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 BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); + static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static BufferingConstraintPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); static BufferingConstraintPolicy_ptr _nil (void) { return (BufferingConstraintPolicy_ptr)0; } - virtual TAO::BufferingConstraint buffering_constraint ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + static void _tao_any_destructor (void*); + + virtual ::TAO::BufferingConstraint buffering_constraint ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -255,7 +263,9 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy protected: BufferingConstraintPolicy (void); + virtual ~BufferingConstraintPolicy (void); + private: BufferingConstraintPolicy (const BufferingConstraintPolicy &); void operator= (const BufferingConstraintPolicy &); @@ -264,19 +274,9 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy #endif /* end #if !defined */ -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - - typedef CORBA::Short SyncScope; - typedef CORBA::Short_out SyncScope_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope; - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_NONE; - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TRANSPORT; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER; - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET; +#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_EAGER_BUFFERING; @@ -291,18 +291,16 @@ TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&); - -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ +// Any operators for interface TAO::BufferingConstraintPolicy +TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying +TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &); #ifndef __ACE_INLINE__ -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &); -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - #endif /* __ACE_INLINE__ */ @@ -310,6 +308,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & #include "TAOC.i" #endif /* defined INLINE */ +#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i index b05d24f8ae2..7e14a90ba54 100644 --- a/TAO/tao/TAOC.i +++ b/TAO/tao/TAOC.i @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id$ TAOC.i,v 1.8 2001/01/17 02:59:45 parsons Exp $ */ +// $Id$ // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: @@ -20,12 +20,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // ************************************************************* -// Inline operations for class TAO::PrioritySpecification_var -// ************************************************************* - -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - -// ************************************************************* // Inline operations for class TAO::BufferingConstraint_var // ************************************************************* @@ -81,19 +75,19 @@ TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint_var &p } else { - TAO::BufferingConstraint *deep_copy = - new TAO::BufferingConstraint (*p.ptr_); - + BufferingConstraint *deep_copy = + new BufferingConstraint (*p.ptr_); + if (deep_copy != 0) { - TAO::BufferingConstraint *tmp = deep_copy; + BufferingConstraint *tmp = deep_copy; deep_copy = this->ptr_; this->ptr_ = tmp; delete deep_copy; } } } - + return *this; } @@ -128,13 +122,13 @@ TAO::BufferingConstraint_var::operator const ::TAO::BufferingConstraint &() cons } ACE_INLINE -TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast +TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast { return *this->ptr_; } ACE_INLINE -TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast +TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast { return *this->ptr_; } @@ -151,7 +145,7 @@ TAO::BufferingConstraint_var::inout (void) return *this->ptr_; } -// mapping for fixed size +// mapping for fixed size ACE_INLINE ::TAO::BufferingConstraint & TAO::BufferingConstraint_var::out (void) { @@ -170,52 +164,10 @@ TAO::BufferingConstraint_var::ptr (void) const return this->ptr_; } + #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_) #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_ -ACE_INLINE TAO::BufferingConstraintPolicy_ptr -tao_TAO_BufferingConstraintPolicy_duplicate ( - TAO::BufferingConstraintPolicy_ptr p - ) -{ - return TAO::BufferingConstraintPolicy::_duplicate (p); -} - -ACE_INLINE void -tao_TAO_BufferingConstraintPolicy_release ( - TAO::BufferingConstraintPolicy_ptr p - ) -{ - CORBA::release (p); -} - -ACE_INLINE TAO::BufferingConstraintPolicy_ptr -tao_TAO_BufferingConstraintPolicy_nil ( - void - ) -{ - return TAO::BufferingConstraintPolicy::_nil (); -} - -ACE_INLINE TAO::BufferingConstraintPolicy_ptr -tao_TAO_BufferingConstraintPolicy_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -ACE_INLINE CORBA::Object * -tao_TAO_BufferingConstraintPolicy_upcast ( - void *src - ) -{ - TAO::BufferingConstraintPolicy **tmp = - ACE_static_cast (TAO::BufferingConstraintPolicy **, src); - return *tmp; -} - #endif /* end #if !defined */ @@ -230,7 +182,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingC return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstraint &_tao_aggregate) @@ -244,7 +196,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstrai return 1; else return 0; - + } -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/diffs/TAOC.cpp.diff b/TAO/tao/diffs/TAOC.cpp.diff index 2749cd4f337..9ef98045832 100644 --- a/TAO/tao/diffs/TAOC.cpp.diff +++ b/TAO/tao/diffs/TAOC.cpp.diff @@ -1,14 +1,6 @@ ---- orig/TAOC.cpp Tue Jun 12 17:41:13 2001 -+++ TAOC.cpp Tue Jun 12 13:58: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,24 +21,15 @@ +--- orig/TAOC.cpp Tue Apr 16 17:44:38 2002 ++++ TAOC.cpp Tue Apr 16 17:48:15 2002 +@@ -21,20 +21,13 @@ #include "TAOC.h" @@ -18,158 +10,46 @@ - -#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 --#endif /* __BORLANDC__ */ -+#include "tao/Typecode.h" - #if !defined (__ACE_INLINE__) - #include "TAOC.i" - #endif /* !defined INLINE */ + #if defined (__BORLANDC__) + #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig + #endif /* __BORLANDC__ */ -+ +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) + - static const CORBA::Long _oc_TAO_BufferingConstraintMode[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order -@@ -187,9 +178,9 @@ - TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraint, &_tc_TAO_tc_TAO_BufferingConstraint) + #if !defined (__ACE_INLINE__) + #include "TAOC.i" + #endif /* !defined INLINE */ +@@ -561,6 +554,8 @@ + TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraintPolicy, &_tc_TAO_tc_TAO_BufferingConstraintPolicy) TAO_NAMESPACE_END --void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer) -+void TAO::BufferingConstraint::_tao_any_destructor (void *x) - { -- BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*, _tao_void_pointer); -+ BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*,x); - delete tmp; - } - -@@ -197,48 +188,6 @@ - TAO_NAMESPACE_BEGIN (TAO) - TAO_NAMESPACE_DEFINE (const CORBA::ULong, BUFFERING_CONSTRAINT_POLICY_TYPE, 1413545985U) - TAO_NAMESPACE_END --TAO::BufferingConstraintPolicy_ptr --tao_TAO_BufferingConstraintPolicy_duplicate ( -- TAO::BufferingConstraintPolicy_ptr p -- ) --{ -- return TAO::BufferingConstraintPolicy::_duplicate (p); --} -- --void --tao_TAO_BufferingConstraintPolicy_release ( -- TAO::BufferingConstraintPolicy_ptr p -- ) --{ -- CORBA::release (p); --} -- --TAO::BufferingConstraintPolicy_ptr --tao_TAO_BufferingConstraintPolicy_nil ( -- void -- ) --{ -- return TAO::BufferingConstraintPolicy::_nil (); --} -- --TAO::BufferingConstraintPolicy_ptr --tao_TAO_BufferingConstraintPolicy_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return TAO::BufferingConstraintPolicy::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_TAO_BufferingConstraintPolicy_upcast ( -- void *src -- ) --{ -- TAO::BufferingConstraintPolicy **tmp = -- ACE_static_cast (TAO::BufferingConstraintPolicy **, src); -- return *tmp; --} - - // ************************************************************* - // Operations for class TAO::BufferingConstraintPolicy_var -@@ -362,9 +311,8 @@ - ACE_static_cast (BufferingConstraintPolicy **, src); - return *tmp; - } -- - // ************************************************************* --// Operations for class TAO::BufferingConstraintPolicy_out -+// Inline operations for class TAO::BufferingConstraintPolicy_out - // ************************************************************* - - TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p) -@@ -475,11 +423,11 @@ - void *retv = 0; - if (type == ACE_reinterpret_cast - (ptr_arith_t, -- &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_narrow)) -+ &BufferingConstraintPolicy::_narrow)) - 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 *, -@@ -503,6 +451,8 @@ - return "IDL:TAO/BufferingConstraintPolicy:1.0"; - } - -+#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ ++#endif (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) + - static const CORBA::Long _oc_TAO_SyncScope[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order -@@ -558,6 +508,10 @@ + TAO_NAMESPACE_TYPE (const CORBA::Short) TAO_NAMESPACE_BEGIN (TAO) + TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_EAGER_BUFFERING, 0) +@@ -570,6 +565,8 @@ TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -2) TAO_NAMESPACE_END -+ -+ + +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) + - void operator<<= (CORBA::Any &_tao_any, const TAO::BufferingConstraint &_tao_elem) // copying - { - TAO_OutputCDR stream; -@@ -594,12 +548,14 @@ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); -- -- CORBA::Boolean result = type->equivalent (TAO::_tc_BufferingConstraint, ACE_TRY_ENV); -+ CORBA::Boolean result = -+ type->equivalent (TAO::_tc_BufferingConstraint, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) -- return 0; // not equivalent -+ { -+ return 0; -+ } - - if (_tao_any.any_owns_data ()) - { -@@ -641,10 +597,4 @@ + // TAO_IDL - Generated from + // be/be_visitor_structure/any_op_cs.cpp:58 + +@@ -770,10 +767,4 @@ return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -- template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>; -- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -- # pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var> +- template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>; +-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +-# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -+#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ ++#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/diffs/TAOC.h.diff b/TAO/tao/diffs/TAOC.h.diff index 1f1ea50a547..8d17325a6a2 100644 --- a/TAO/tao/diffs/TAOC.h.diff +++ b/TAO/tao/diffs/TAOC.h.diff @@ -1,27 +1,8 @@ ---- orig/TAOC.h Tue Jun 12 17:41:13 2001 -+++ TAOC.h Tue Jun 12 13:58:15 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ Id: TAOC.h,v 1.24 2000/06/28 03:47:12 marina Exp $ */ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -19,19 +19,29 @@ - // Information about TAO is available at: - // http://www.cs.wustl.edu/~schmidt/TAO.html - -+// ****** 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_ORIG_TAOC_H_ +--- orig/TAOC.h Tue Apr 16 17:44:38 2002 ++++ TAOC.h Tue Apr 16 17:47:25 2002 +@@ -23,16 +23,15 @@ #define _TAO_IDL_ORIG_TAOC_H_ -- + #include "ace/pre.h" -#include "tao/corba.h" + @@ -32,120 +13,28 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/corbafwd.h" --#include "PolicyC.h" --#include "TimeBaseC.h" -+#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) -+ -+#include "tao/PolicyC.h" -+#include "tao/TimeBaseC.h" -+ -+#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ + #include "PolicyC.h" + #include "TimeBaseC.h" +-#include "Messaging_SyncScopeC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO -@@ -58,6 +68,9 @@ +@@ -59,6 +58,8 @@ TAO_NAMESPACE TAO { -+ +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) + typedef CORBA::UShort BufferingConstraintMode; typedef CORBA::UShort_out BufferingConstraintMode_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode; -@@ -86,23 +99,20 @@ - TimeBase::TimeT timeout; - CORBA::ULong message_count; - CORBA::ULong message_bytes; -- - }; - - class TAO_Export BufferingConstraint_var - { - public: -- BufferingConstraint_var (void); -+ BufferingConstraint_var (void); // default constructor - BufferingConstraint_var (BufferingConstraint *); -- BufferingConstraint_var (const BufferingConstraint_var &); -- // Fixed-size types only. -- BufferingConstraint_var (const BufferingConstraint &); -- ~BufferingConstraint_var (void); -+ BufferingConstraint_var (const BufferingConstraint_var &); // copy constructor -+ BufferingConstraint_var (const BufferingConstraint &); // fixed-size types only -+ ~BufferingConstraint_var (void); // destructor - - BufferingConstraint_var &operator= (BufferingConstraint *); - BufferingConstraint_var &operator= (const BufferingConstraint_var &); -- // Fixed-size types only. -- BufferingConstraint_var &operator= (const BufferingConstraint &); -+ BufferingConstraint_var &operator= (const BufferingConstraint &); // fixed-size types only - BufferingConstraint *operator-> (void); - const BufferingConstraint *operator-> (void) const; - -@@ -166,10 +176,7 @@ - static BufferingConstraintPolicy_ptr duplicate (BufferingConstraintPolicy_ptr); - static void release (BufferingConstraintPolicy_ptr); - static BufferingConstraintPolicy_ptr nil (void); -- static BufferingConstraintPolicy_ptr narrow ( -- CORBA::Object *, -- CORBA::Environment & -- ); -+ static BufferingConstraintPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &); - static CORBA::Object * upcast (void *); - - private: -@@ -210,8 +217,7 @@ - #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_) - #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_ + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode; +@@ -275,14 +276,17 @@ -- class TAO_Export BufferingConstraintPolicy -- : public virtual CORBA::Policy -+class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy - { - public: - #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -@@ -221,19 +227,16 @@ - - // the static operations - static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); -- - static BufferingConstraintPolicy_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- - static BufferingConstraintPolicy_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- - static BufferingConstraintPolicy_ptr _nil (void) - { - return (BufferingConstraintPolicy_ptr)0; -@@ -252,10 +255,8 @@ - virtual const char* _interface_repository_id (void) const; - - protected: -- BufferingConstraintPolicy (); -- -+ BufferingConstraintPolicy (void); - virtual ~BufferingConstraintPolicy (void); -- - private: - BufferingConstraintPolicy (const BufferingConstraintPolicy &); - void operator= (const BufferingConstraintPolicy &); -@@ -264,6 +265,8 @@ + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; - #endif /* end #if !defined */ - -+#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ ++#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ + - typedef CORBA::Short SyncScope; - typedef CORBA::Short_out SyncScope_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope; -@@ -280,19 +283,26 @@ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_EAGER_BUFFERING; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_DELAYED_BUFFERING; @@ -158,18 +47,12 @@ TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated - TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&); - -+#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ +@@ -303,6 +307,8 @@ + #if defined (__ACE_INLINE__) + #include "TAOC.i" + #endif /* defined INLINE */ + - #ifndef __ACE_INLINE__ - -+#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) -+ - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &); - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &); -+ -+#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - - #endif /* __ACE_INLINE__ */ ++#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) + #pragma warning(pop) diff --git a/TAO/tao/diffs/TAOC.i.diff b/TAO/tao/diffs/TAOC.i.diff index 1929df1049d..e69de29bb2d 100644 --- a/TAO/tao/diffs/TAOC.i.diff +++ b/TAO/tao/diffs/TAOC.i.diff @@ -1,98 +0,0 @@ ---- orig/TAOC.i Tue Jun 12 17:41:13 2001 -+++ TAOC.i Tue Jun 12 13:58:15 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ TAOC.i,v 1.8 2001/01/17 02:59:45 parsons Exp $ */ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -20,6 +20,12 @@ - // http://www.cs.wustl.edu/~schmidt/TAO.html - - // ************************************************************* -+// Inline operations for class TAO::PrioritySpecification_var -+// ************************************************************* -+ -+#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) -+ -+// ************************************************************* - // Inline operations for class TAO::BufferingConstraint_var - // ************************************************************* - -@@ -75,12 +81,12 @@ - } - else - { -- BufferingConstraint *deep_copy = -- new BufferingConstraint (*p.ptr_); -+ TAO::BufferingConstraint *deep_copy = -+ new TAO::BufferingConstraint (*p.ptr_); - - if (deep_copy != 0) - { -- BufferingConstraint *tmp = deep_copy; -+ TAO::BufferingConstraint *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; -@@ -164,10 +170,52 @@ - return this->ptr_; - } - -- - #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_) - #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_ - -+ACE_INLINE TAO::BufferingConstraintPolicy_ptr -+tao_TAO_BufferingConstraintPolicy_duplicate ( -+ TAO::BufferingConstraintPolicy_ptr p -+ ) -+{ -+ return TAO::BufferingConstraintPolicy::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_TAO_BufferingConstraintPolicy_release ( -+ TAO::BufferingConstraintPolicy_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE TAO::BufferingConstraintPolicy_ptr -+tao_TAO_BufferingConstraintPolicy_nil ( -+ void -+ ) -+{ -+ return TAO::BufferingConstraintPolicy::_nil (); -+} -+ -+ACE_INLINE TAO::BufferingConstraintPolicy_ptr -+tao_TAO_BufferingConstraintPolicy_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return TAO::BufferingConstraintPolicy::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_TAO_BufferingConstraintPolicy_upcast ( -+ void *src -+ ) -+{ -+ TAO::BufferingConstraintPolicy **tmp = -+ ACE_static_cast (TAO::BufferingConstraintPolicy **, src); -+ return *tmp; -+} -+ - - #endif /* end #if !defined */ - -@@ -199,3 +247,4 @@ - - } - -+#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ |