diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-18 11:29:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-18 11:29:18 +0000 |
| commit | 74f41da8e05e0c372864c100e7565949380103eb (patch) | |
| tree | 8eda1a0f91d46f0bbbb073483b47ba9f9e7392a0 | |
| parent | 01375807c19b8f938c3406286b5a3a43621a04cc (diff) | |
| download | ATCD-74f41da8e05e0c372864c100e7565949380103eb.tar.gz | |
ChangeLogTag: Fri Feb 18 10:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
79 files changed, 892 insertions, 1026 deletions
diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp index 14b5b87e812..0a818e79d32 100644 --- a/TAO/tao/AnySeqC.cpp +++ b/TAO/tao/AnySeqC.cpp @@ -175,7 +175,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index 2e94e92fa1d..c9b3894eac1 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -106,10 +106,10 @@ BiDirPolicy::BidirectionalPolicy::_narrow ( { return BidirectionalPolicy::_nil (); } - + BidirectionalPolicy_ptr proxy = dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref); - + return BidirectionalPolicy::_duplicate (proxy); } @@ -123,10 +123,10 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow ( { return BidirectionalPolicy::_nil (); } - + BidirectionalPolicy_ptr proxy = dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref); - + return BidirectionalPolicy::_duplicate (proxy); } @@ -137,7 +137,7 @@ BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -166,11 +166,11 @@ BiDirPolicy::BidirectionalPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -182,11 +182,11 @@ const char* BiDirPolicy::BidirectionalPolicy::_interface_repository_id (void) co CORBA::Boolean BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff index 0fa2c8a8f8a..625ccc8ea8b 100644 --- a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff +++ b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff @@ -1,13 +1,5 @@ ---- orig/BiDirPolicyC.h 2005-02-11 13:45:01.971851200 +0100 -+++ BiDirPolicyC.h 2005-02-11 13:48:51.000000000 +0100 -@@ -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: +--- orig/BiDirPolicyC.h 2005-02-18 12:27:27.078513600 +0100 ++++ BiDirPolicyC.h 2005-02-18 12:27:27.278801600 +0100 @@ -33,6 +33,9 @@ #include /**/ "ace/pre.h" @@ -27,16 +19,8 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif ---- orig/BiDirPolicyC.cpp 2005-02-11 13:45:01.971851200 +0100 -+++ BiDirPolicyC.cpp 2005-02-11 13:48:51.000000000 +0100 -@@ -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: +--- orig/BiDirPolicyC.cpp 2005-02-18 12:27:27.078513600 +0100 ++++ BiDirPolicyC.cpp 2005-02-18 12:27:27.288816000 +0100 @@ -29,7 +29,7 @@ // be\be_codegen.cpp:302 diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp index 9d224a1d73f..be30335fffc 100644 --- a/TAO/tao/BooleanSeqC.cpp +++ b/TAO/tao/BooleanSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index 0da12c2b61c..337aa508bcd 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -111,7 +111,7 @@ CORBA::Exception *CORBA::Bounds::_alloc (void) CORBA::Exception * CORBA::Bounds::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::CORBA::Bounds (*this), @@ -213,7 +213,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 943d9f377d3..205036a846f 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -269,7 +269,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp index 18bb086b837..6e72f0c3bd8 100644 --- a/TAO/tao/CharSeqC.cpp +++ b/TAO/tao/CharSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 1e8cbfa1742..848794ad85a 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -170,11 +170,11 @@ CORBA::Current::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -186,11 +186,11 @@ const char* CORBA::Current::_interface_repository_id (void) const CORBA::Boolean CORBA::Current::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 21c7228a4bd..147a36121a2 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -41,7 +41,6 @@ #include "tao/ORB_Core.h" #include "tao/IFR_Client_Adapter.h" -#include "tao/DynamicC.h" #include "ace/Dynamic_Service.h" #if defined (__BORLANDC__) @@ -93,15 +92,13 @@ TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr return adapter->interfacedef_cdr_insert (cdr, this->x_); } - - // Arg traits specializations. namespace TAO { #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) #define _CORBA_POLICY__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_Export Arg_Traits<CORBA::Policy> : public @@ -118,7 +115,7 @@ namespace TAO #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_) #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_Export Arg_Traits<CORBA::InterfaceDef> : public @@ -176,7 +173,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -196,21 +193,21 @@ TAO::Collocation_Proxy_Broker * { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_DomainManager_Proxy_Broker_ == 0) { CORBA_DomainManager_setup_collocation (); } - + TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_policy_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -219,10 +216,10 @@ TAO::Collocation_Proxy_Broker * 17, this->the_TAO_DomainManager_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -311,7 +308,7 @@ CORBA::DomainManager::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { @@ -516,7 +513,7 @@ CORBA::ConstructionPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { @@ -742,7 +739,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 4d3f3700691..f2c073079a9 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -73,13 +73,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -89,22 +89,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_DOMAINMANAGER__VAR_OUT_CH_) #define _CORBA_DOMAINMANAGER__VAR_OUT_CH_ - + class DomainManager; typedef DomainManager *DomainManager_ptr; - + typedef TAO_Objref_Var_T< DomainManager > DomainManager_var; - + typedef TAO_Objref_Out_T< DomainManager @@ -112,13 +112,13 @@ namespace CORBA DomainManager_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_DOMAINMANAGER_CH_) #define _CORBA_DOMAINMANAGER_CH_ - + class TAO_Export DomainManager : public virtual CORBA::Object { @@ -126,30 +126,30 @@ namespace CORBA friend class TAO::Narrow_Utils<DomainManager>; typedef DomainManager_ptr _ptr_type; typedef DomainManager_var _var_type; - + // 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 static_cast<DomainManager_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr get_domain_policy ( ::CORBA::PolicyType policy_type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -157,34 +157,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_; - + protected: // Concrete interface only. DomainManager (void); - + // 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 (void); - + // Concrete non-local interface only. DomainManager ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. DomainManager ( TAO_Stub *objref, @@ -192,9 +192,9 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~DomainManager (void); - + private: // Private and unimplemented for concrete interfaces. DomainManager (const DomainManager &); diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp index a6c63b761a4..2819eecbe44 100644 --- a/TAO/tao/DoubleSeqC.cpp +++ b/TAO/tao/DoubleSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index dfe3f405b2c..e44426696f2 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -142,7 +142,7 @@ CORBA::Exception *DynamicAny::DynAny::InvalidValue::_alloc (void) CORBA::Exception * DynamicAny::DynAny::InvalidValue::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::DynamicAny::DynAny::InvalidValue (*this), @@ -226,7 +226,7 @@ CORBA::Exception *DynamicAny::DynAny::TypeMismatch::_alloc (void) CORBA::Exception * DynamicAny::DynAny::TypeMismatch::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::DynamicAny::DynAny::TypeMismatch (*this), @@ -330,11 +330,11 @@ DynamicAny::DynAny::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -346,7 +346,7 @@ const char* DynamicAny::DynAny::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynAny::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -465,11 +465,11 @@ DynamicAny::DynFixed::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -481,7 +481,7 @@ const char* DynamicAny::DynFixed::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynFixed::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -600,11 +600,11 @@ DynamicAny::DynEnum::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -616,7 +616,7 @@ const char* DynamicAny::DynEnum::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynEnum::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -833,11 +833,11 @@ DynamicAny::DynStruct::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -849,7 +849,7 @@ const char* DynamicAny::DynStruct::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynStruct::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -968,11 +968,11 @@ DynamicAny::DynUnion::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -984,7 +984,7 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynUnion::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1194,11 +1194,11 @@ DynamicAny::DynSequence::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1210,7 +1210,7 @@ const char* DynamicAny::DynSequence::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynSequence::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1329,11 +1329,11 @@ DynamicAny::DynArray::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1345,7 +1345,7 @@ const char* DynamicAny::DynArray::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynArray::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1464,11 +1464,11 @@ DynamicAny::DynValue::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1480,7 +1480,7 @@ const char* DynamicAny::DynValue::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynValue::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1575,7 +1575,7 @@ CORBA::Exception *DynamicAny::DynAnyFactory::InconsistentTypeCode::_alloc (void) CORBA::Exception * DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::DynamicAny::DynAnyFactory::InconsistentTypeCode (*this), @@ -1679,11 +1679,11 @@ DynamicAny::DynAnyFactory::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1695,7 +1695,7 @@ const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const CORBA::Boolean DynamicAny::DynAnyFactory::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1866,7 +1866,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DynamicAny/diffs/DynamicAny.diff b/TAO/tao/DynamicAny/diffs/DynamicAny.diff index cc422c43a7f..30516db185e 100644 --- a/TAO/tao/DynamicAny/diffs/DynamicAny.diff +++ b/TAO/tao/DynamicAny/diffs/DynamicAny.diff @@ -1,5 +1,5 @@ ---- orig/DynamicAnyC.h 2005-02-11 13:49:41.303510400 +0100 -+++ DynamicAnyC.h 2005-02-11 13:49:41.774187200 +0100 +--- orig/DynamicAnyC.h 2005-02-18 12:28:35.777297600 +0100 ++++ DynamicAnyC.h 2005-02-18 12:28:36.067715200 +0100 @@ -34,6 +34,10 @@ #include /**/ "ace/pre.h" @@ -19,8 +19,8 @@ #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" ---- orig/DynamicAnyC.cpp 2005-02-11 13:49:41.303510400 +0100 -+++ DynamicAnyC.cpp 2005-02-11 13:49:41.964460800 +0100 +--- orig/DynamicAnyC.cpp 2005-02-18 12:28:35.787312000 +0100 ++++ DynamicAnyC.cpp 2005-02-18 12:28:36.077729600 +0100 @@ -29,7 +29,7 @@ // be\be_codegen.cpp:302 diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index bf33bffefee..9d04e20bb22 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -300,7 +300,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp index 16763980505..f0d9e08219b 100644 --- a/TAO/tao/Dynamic_ParameterC.cpp +++ b/TAO/tao/Dynamic_ParameterC.cpp @@ -86,7 +86,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp index 58b64fa300d..d5066f9a574 100644 --- a/TAO/tao/FloatSeqC.cpp +++ b/TAO/tao/FloatSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index ae44cf7c754..bd5e0044fbd 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -391,7 +391,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index 3f7df9cbb02..b206754dbae 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -245,7 +245,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp index c0531091af0..75c22ebce3e 100644 --- a/TAO/tao/IIOP_EndpointsC.cpp +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -213,7 +213,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index 4c54c1d9d14..6287af6bb4f 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -151,7 +151,7 @@ CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void) CORBA::Exception * IOP::Codec::InvalidTypeForEncoding::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IOP::Codec::InvalidTypeForEncoding (*this), @@ -287,7 +287,7 @@ CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void) CORBA::Exception * IOP::Codec::FormatMismatch::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IOP::Codec::FormatMismatch (*this), @@ -419,7 +419,7 @@ CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void) CORBA::Exception * IOP::Codec::TypeMismatch::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IOP::Codec::TypeMismatch (*this), @@ -571,11 +571,11 @@ IOP::Codec::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -587,7 +587,7 @@ const char* IOP::Codec::_interface_repository_id (void) const CORBA::Boolean IOP::Codec::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -702,7 +702,7 @@ CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void) CORBA::Exception * IOP::CodecFactory::UnknownEncoding::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IOP::CodecFactory::UnknownEncoding (*this), @@ -857,11 +857,11 @@ IOP::CodecFactory::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -873,7 +873,7 @@ const char* IOP::CodecFactory::_interface_repository_id (void) const CORBA::Boolean IOP::CodecFactory::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index 43ad5c704dc..addd00ead5b 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -820,7 +820,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp index 8c9737b4c12..ec418b6e566 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.cpp +++ b/TAO/tao/IORInterceptor/IORInfoC.cpp @@ -180,11 +180,11 @@ PortableInterceptor::IORInfo::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -196,11 +196,11 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const CORBA::Boolean PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp index 27214c5462b..ebf8c222ef9 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp @@ -166,11 +166,11 @@ PortableInterceptor::IORInterceptor::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -182,11 +182,11 @@ const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void) CORBA::Boolean PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IORInterceptor/diff/IORInterceptor.diff b/TAO/tao/IORInterceptor/diff/IORInterceptor.diff index bdf00fec00e..093fb2b40e9 100644 --- a/TAO/tao/IORInterceptor/diff/IORInterceptor.diff +++ b/TAO/tao/IORInterceptor/diff/IORInterceptor.diff @@ -1,5 +1,5 @@ ---- orig/IORInterceptorC.h 2005-02-11 14:57:02.053824000 +0100 -+++ IORInterceptorC.h 2005-02-11 14:57:02.734803200 +0100 +--- orig/IORInterceptorC.h 2005-02-18 12:20:12.583740800 +0100 ++++ IORInterceptorC.h 2005-02-18 12:20:13.304777600 +0100 @@ -34,6 +34,9 @@ #include /**/ "ace/pre.h" @@ -10,8 +10,8 @@ #include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) ---- orig/IORInterceptorC.cpp 2005-02-11 14:57:02.053824000 +0100 -+++ IORInterceptorC.cpp 2005-02-11 14:57:02.854976000 +0100 +--- orig/IORInterceptorC.cpp 2005-02-18 12:20:12.583740800 +0100 ++++ IORInterceptorC.cpp 2005-02-18 12:20:13.304777600 +0100 @@ -29,7 +29,7 @@ // be\be_codegen.cpp:302 diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index 0a36921a60c..32451ca3f94 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -50,7 +50,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IORTable::AlreadyBound::AlreadyBound (void) @@ -102,7 +102,7 @@ CORBA::Exception *IORTable::AlreadyBound::_alloc (void) CORBA::Exception * IORTable::AlreadyBound::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IORTable::AlreadyBound (*this), @@ -125,7 +125,7 @@ void IORTable::AlreadyBound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -138,13 +138,13 @@ void IORTable::AlreadyBound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IORTable::NotFound::NotFound (void) @@ -196,7 +196,7 @@ CORBA::Exception *IORTable::NotFound::_alloc (void) CORBA::Exception * IORTable::NotFound::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IORTable::NotFound (*this), @@ -219,7 +219,7 @@ void IORTable::NotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -232,7 +232,7 @@ void IORTable::NotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -294,10 +294,10 @@ IORTable::Table::_narrow ( { return Table::_nil (); } - + Table_ptr proxy = dynamic_cast<Table_ptr> (_tao_objref); - + return Table::_duplicate (proxy); } @@ -311,10 +311,10 @@ IORTable::Table::_unchecked_narrow ( { return Table::_nil (); } - + Table_ptr proxy = dynamic_cast<Table_ptr> (_tao_objref); - + return Table::_duplicate (proxy); } @@ -325,7 +325,7 @@ IORTable::Table::_duplicate (Table_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -350,11 +350,11 @@ IORTable::Table::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -366,7 +366,7 @@ const char* IORTable::Table::_interface_repository_id (void) const CORBA::Boolean IORTable::Table::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -425,10 +425,10 @@ IORTable::Locator::_narrow ( { return Locator::_nil (); } - + Locator_ptr proxy = dynamic_cast<Locator_ptr> (_tao_objref); - + return Locator::_duplicate (proxy); } @@ -442,10 +442,10 @@ IORTable::Locator::_unchecked_narrow ( { return Locator::_nil (); } - + Locator_ptr proxy = dynamic_cast<Locator_ptr> (_tao_objref); - + return Locator::_duplicate (proxy); } @@ -456,7 +456,7 @@ IORTable::Locator::_duplicate (Locator_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -481,11 +481,11 @@ IORTable::Locator::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -497,7 +497,7 @@ const char* IORTable::Locator::_interface_repository_id (void) const CORBA::Boolean IORTable::Locator::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -541,7 +541,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index c19ba7110c5..0115c6db017 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -36,10 +36,6 @@ #include "ace/config-all.h" - #ifndef TAO_IORTABLE_SAFE_INCLUDE - #error "You should not include IORTableC.h directly, use IORTable.h" - #endif /* !TAO_IORTABLE_SAFE_INCLUDE */ - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -51,6 +47,10 @@ #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" + #ifndef TAO_IORTABLE_SAFE_INCLUDE + #error "You should not include IORTableC.h directly, use IORTable.h" + #endif /* !TAO_IORMANIP_SAFE_INCLUDE */ + #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif @@ -72,13 +72,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -88,22 +88,22 @@ namespace TAO namespace IORTable { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_IORTABLE_LOCATOR__VAR_OUT_CH_) #define _IORTABLE_LOCATOR__VAR_OUT_CH_ - + class Locator; typedef Locator *Locator_ptr; - + typedef TAO_Objref_Var_T< Locator > Locator_var; - + typedef TAO_Objref_Out_T< Locator @@ -111,28 +111,28 @@ namespace IORTable Locator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IORTABLE_ALREADYBOUND_CH_) #define _IORTABLE_ALREADYBOUND_CH_ - + class TAO_IORTable_Export AlreadyBound : public CORBA::UserException { public: - + AlreadyBound (void); AlreadyBound (const AlreadyBound &); ~AlreadyBound (void); AlreadyBound &operator= (const AlreadyBound &); - + static AlreadyBound *_downcast (CORBA::Exception *); static const AlreadyBound *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -141,39 +141,39 @@ namespace IORTable TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IORTABLE_NOTFOUND_CH_) #define _IORTABLE_NOTFOUND_CH_ - + class TAO_IORTable_Export NotFound : public CORBA::UserException { public: - + NotFound (void); NotFound (const NotFound &); ~NotFound (void); NotFound &operator= (const NotFound &); - + static NotFound *_downcast (CORBA::Exception *); static const NotFound *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -182,33 +182,33 @@ namespace IORTable TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_IORTABLE_TABLE__VAR_OUT_CH_) #define _IORTABLE_TABLE__VAR_OUT_CH_ - + class Table; typedef Table *Table_ptr; - + typedef TAO_Objref_Var_T< Table > Table_var; - + typedef TAO_Objref_Out_T< Table @@ -216,43 +216,43 @@ namespace IORTable Table_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IORTABLE_TABLE_CH_) #define _IORTABLE_TABLE_CH_ - + class TAO_IORTable_Export Table : public virtual CORBA::Object { public: typedef Table_ptr _ptr_type; typedef Table_var _var_type; - + // The static operations. static Table_ptr _duplicate (Table_ptr obj); - + static Table_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Table_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Table_ptr _nil (void) { return static_cast<Table_ptr> (0); } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void bind ( const char * object_key, const char * IOR @@ -262,10 +262,10 @@ namespace IORTable CORBA::SystemException, ::IORTable::AlreadyBound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void rebind ( const char * object_key, const char * IOR @@ -274,10 +274,10 @@ namespace IORTable ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void unbind ( const char * object_key ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -286,10 +286,10 @@ namespace IORTable CORBA::SystemException, ::IORTable::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_locator ( ::IORTable::Locator_ptr the_locator ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -297,69 +297,69 @@ namespace IORTable ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Table (void); - + virtual ~Table (void); - + private: // Private and unimplemented for concrete interfaces. Table (const Table &); - + void operator= (const Table &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IORTABLE_LOCATOR_CH_) #define _IORTABLE_LOCATOR_CH_ - + class TAO_IORTable_Export Locator : public virtual CORBA::Object { public: typedef Locator_ptr _ptr_type; typedef Locator_var _var_type; - + // The static operations. static Locator_ptr _duplicate (Locator_ptr obj); - + static Locator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Locator_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Locator_ptr _nil (void) { return static_cast<Locator_ptr> (0); } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * locate ( const char * object_key ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -368,28 +368,28 @@ namespace IORTable CORBA::SystemException, ::IORTable::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Locator (void); - + virtual ~Locator (void); - + private: // Private and unimplemented for concrete interfaces. Locator (const Locator &); - + void operator= (const Locator &); }; @@ -409,7 +409,7 @@ namespace TAO #if !defined (_IORTABLE_LOCATOR__TRAITS_CH_) #define _IORTABLE_LOCATOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORTable_Export Objref_Traits< ::IORTable::Locator> { @@ -430,7 +430,7 @@ namespace TAO #if !defined (_IORTABLE_TABLE__TRAITS_CH_) #define _IORTABLE_TABLE__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORTable_Export Objref_Traits< ::IORTable::Table> { diff --git a/TAO/tao/IORTable/diff/IORTable.diff b/TAO/tao/IORTable/diff/IORTable.diff new file mode 100644 index 00000000000..616072f0fbd --- /dev/null +++ b/TAO/tao/IORTable/diff/IORTable.diff @@ -0,0 +1,24 @@ +--- orig/IORTableC.h 2005-02-18 12:17:41.246128000 +0100 ++++ IORTableC.h 2005-02-18 12:17:41.726819200 +0100 +@@ -47,6 +47,10 @@ + #include "tao/Object.h" + #include "tao/Objref_VarOut_T.h" + ++ #ifndef TAO_IORTABLE_SAFE_INCLUDE ++ #error "You should not include IORTableC.h directly, use IORTable.h" ++ #endif /* !TAO_IORMANIP_SAFE_INCLUDE */ ++ + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO + #endif +--- orig/IORTableC.cpp 2005-02-18 12:17:41.246128000 +0100 ++++ IORTableC.cpp 2005-02-18 12:17:41.746848000 +0100 +@@ -29,7 +29,7 @@ + // be\be_codegen.cpp:302 + + +-#include "IORTableC.h" ++#include "IORTable.h" + #include "tao/CDR.h" + #include "ace/OS_NS_string.h" + diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp index 27c20dd5342..cf5205b67de 100644 --- a/TAO/tao/LongDoubleSeqC.cpp +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp index 5fd9b898126..7f51e243c70 100644 --- a/TAO/tao/LongLongSeqC.cpp +++ b/TAO/tao/LongLongSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp index 4c7ea32de2a..3607a2f8af4 100644 --- a/TAO/tao/LongSeqC.cpp +++ b/TAO/tao/LongSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index cb7a5b22039..956c427704c 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -324,7 +324,7 @@ Messaging::ReplyHandler::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { @@ -368,7 +368,7 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_I } // TAO_IDL - Generated from -// be\be_visitor_valuetype/field_cs.cpp:568 +// be\be_visitor_valuetype/field_cs.cpp:580 // Accessor to set the member. void @@ -386,7 +386,7 @@ OBV_Messaging::ExceptionHolder::is_system_exception (void) const } // TAO_IDL - Generated from -// be\be_visitor_valuetype/field_cs.cpp:568 +// be\be_visitor_valuetype/field_cs.cpp:580 // Accessor to set the member. void @@ -404,7 +404,7 @@ OBV_Messaging::ExceptionHolder::byte_order (void) const } // TAO_IDL - Generated from -// be\be_visitor_valuetype/field_cs.cpp:743 +// be\be_visitor_valuetype/field_cs.cpp:755 // Accessor to set the member. void @@ -534,7 +534,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index e5b19589378..79ab3cb8f44 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -149,26 +149,26 @@ namespace Messaging static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:412 + // be\be_visitor_valuetype/field_ch.cpp:424 virtual void is_system_exception (CORBA::Boolean) = 0; virtual CORBA::Boolean is_system_exception (void) const = 0; // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:412 + // be\be_visitor_valuetype/field_ch.cpp:424 virtual void byte_order (CORBA::Boolean) = 0; virtual CORBA::Boolean byte_order (void) const = 0; // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:485 + // be\be_visitor_valuetype/field_ch.cpp:497 virtual void marshaled_exception (const CORBA::OctetSeq &) = 0; virtual const CORBA::OctetSeq &marshaled_exception (void) const = 0; virtual CORBA::OctetSeq &marshaled_exception (void) = 0; // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:238 + // be\be_visitor_valuetype/valuetype_ch.cpp:246 protected: ExceptionHolder (void); @@ -371,19 +371,19 @@ namespace OBV_Messaging virtual ~ExceptionHolder (void); // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:412 + // be\be_visitor_valuetype/field_ch.cpp:424 virtual void is_system_exception (CORBA::Boolean); virtual CORBA::Boolean is_system_exception (void) const; // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:412 + // be\be_visitor_valuetype/field_ch.cpp:424 virtual void byte_order (CORBA::Boolean); virtual CORBA::Boolean byte_order (void) const; // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:485 + // be\be_visitor_valuetype/field_ch.cpp:497 virtual void marshaled_exception (const CORBA::OctetSeq &); virtual const CORBA::OctetSeq &marshaled_exception (void) const; diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp index 295d4ce280c..df401e016ac 100644 --- a/TAO/tao/Messaging/MessagingS.cpp +++ b/TAO/tao/Messaging/MessagingS.cpp @@ -88,7 +88,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POAmerge\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -599,7 +599,7 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1683 +// be\be_visitor_root/root.cpp:1563 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h index d9145954059..03fb3147a17 100644 --- a/TAO/tao/Messaging/MessagingS.h +++ b/TAO/tao/Messaging/MessagingS.h @@ -229,6 +229,7 @@ namespace POA_Messaging // TAO_IDL - Generated from // be\be_codegen.cpp:997 +#include "MessagingS_T.h" #if defined (__ACE_INLINE__) #include "MessagingS.inl" diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index d9a76f35b35..4a879ffaae9 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -174,11 +174,11 @@ Messaging::RebindPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -190,7 +190,7 @@ const char* Messaging::RebindPolicy::_interface_repository_id (void) const CORBA::Boolean Messaging::RebindPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -330,11 +330,11 @@ Messaging::RequestPriorityPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -346,7 +346,7 @@ const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) co CORBA::Boolean Messaging::RequestPriorityPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -473,11 +473,11 @@ Messaging::ReplyPriorityPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -489,7 +489,7 @@ const char* Messaging::ReplyPriorityPolicy::_interface_repository_id (void) cons CORBA::Boolean Messaging::ReplyPriorityPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -616,11 +616,11 @@ Messaging::RequestStartTimePolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -632,7 +632,7 @@ const char* Messaging::RequestStartTimePolicy::_interface_repository_id (void) c CORBA::Boolean Messaging::RequestStartTimePolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -759,11 +759,11 @@ Messaging::RequestEndTimePolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -775,7 +775,7 @@ const char* Messaging::RequestEndTimePolicy::_interface_repository_id (void) con CORBA::Boolean Messaging::RequestEndTimePolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -902,11 +902,11 @@ Messaging::ReplyStartTimePolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -918,7 +918,7 @@ const char* Messaging::ReplyStartTimePolicy::_interface_repository_id (void) con CORBA::Boolean Messaging::ReplyStartTimePolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1045,11 +1045,11 @@ Messaging::ReplyEndTimePolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1061,7 +1061,7 @@ const char* Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const CORBA::Boolean Messaging::ReplyEndTimePolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1188,11 +1188,11 @@ Messaging::RelativeRequestTimeoutPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1204,7 +1204,7 @@ const char* Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (v CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1344,11 +1344,11 @@ Messaging::RoutingPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1360,7 +1360,7 @@ const char* Messaging::RoutingPolicy::_interface_repository_id (void) const CORBA::Boolean Messaging::RoutingPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1487,11 +1487,11 @@ Messaging::MaxHopsPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1503,7 +1503,7 @@ const char* Messaging::MaxHopsPolicy::_interface_repository_id (void) const CORBA::Boolean Messaging::MaxHopsPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1630,11 +1630,11 @@ Messaging::QueueOrderPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1646,7 +1646,7 @@ const char* Messaging::QueueOrderPolicy::_interface_repository_id (void) const CORBA::Boolean Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1696,7 +1696,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 596fb1f9885..4a9859ea775 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -174,11 +174,11 @@ Messaging::RelativeRoundtripTimeoutPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -190,11 +190,11 @@ const char* Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index 698b46a7e97..ca0a3fbe6d8 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -174,11 +174,11 @@ Messaging::SyncScopePolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -190,11 +190,11 @@ const char* Messaging::SyncScopePolicy::_interface_repository_id (void) const CORBA::Boolean Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index 0c016867048..9bdbeca422b 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -174,11 +174,11 @@ TAO::ConnectionTimeoutPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -190,11 +190,11 @@ const char* TAO::ConnectionTimeoutPolicy::_interface_repository_id (void) const CORBA::Boolean TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff index f50e9f94f4e..6f7d6cb50b7 100644 --- a/TAO/tao/Messaging/diffs/Messaging.diff +++ b/TAO/tao/Messaging/diffs/Messaging.diff @@ -1,5 +1,13 @@ ---- orig/MessagingC.h 2005-02-14 10:51:00.842680000 +0100 -+++ MessagingC.h 2005-02-14 10:51:01.093040000 +0100 +--- orig/MessagingC.h 2005-02-18 12:11:33.256985600 +0100 ++++ MessagingC.h 2005-02-18 12:13:24.000000000 +0100 +@@ -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: @@ -36,6 +36,10 @@ #include "ace/config-all.h" @@ -11,8 +19,16 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ ---- orig/MessagingC.cpp 2005-02-14 10:51:00.842680000 +0100 -+++ MessagingC.cpp 2005-02-14 10:51:01.103054400 +0100 +--- orig/MessagingC.cpp 2005-02-18 12:11:33.267000000 +0100 ++++ MessagingC.cpp 2005-02-18 12:13:24.000000000 +0100 +@@ -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: @@ -29,7 +29,7 @@ // be\be_codegen.cpp:302 @@ -22,8 +38,16 @@ #include "tao/CDR.h" #include "tao/Object_T.h" #include "tao/ORB_Core.h" ---- orig/MessagingA.cpp 2005-02-14 10:51:00.842680000 +0100 -+++ MessagingA.cpp 2005-02-14 10:51:01.123083200 +0100 +--- orig/MessagingA.cpp 2005-02-18 12:11:33.267000000 +0100 ++++ MessagingA.cpp 2005-02-18 12:13:24.000000000 +0100 +@@ -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: @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html @@ -33,8 +57,16 @@ #include "tao/Typecode.h" #include "tao/CDR.h" #include "tao/Any.h" ---- orig/MessagingS.h 2005-02-14 10:51:00.842680000 +0100 -+++ MessagingS.h 2005-02-14 10:52:20.537275200 +0100 +--- orig/MessagingS.h 2005-02-18 12:11:33.256985600 +0100 ++++ MessagingS.h 2005-02-18 12:13:24.000000000 +0100 +@@ -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: @@ -34,9 +34,7 @@ #include /**/ "ace/pre.h" diff --git a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff index 9f7d316dede..f8b0a8deac7 100644 --- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff +++ b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff @@ -1,5 +1,13 @@ ---- orig/Messaging_No_ImplC.h 2005-02-14 10:50:59.911340800 +0100 -+++ Messaging_No_ImplC.h 2005-02-14 10:51:01.193184000 +0100 +--- orig/Messaging_No_ImplC.h 2005-02-18 12:11:32.265560000 +0100 ++++ Messaging_No_ImplC.h 2005-02-18 12:13:24.000000000 +0100 +@@ -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: @@ -52,6 +52,11 @@ #include "tao/PolicyC.h" #include "tao/PollableC.h" diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 055ac80c470..1e55ae831b4 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -212,7 +212,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index 87dd3f99c76..807a5fbad61 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -161,7 +161,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index b79e2a5fa49..6d66acacab5 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -54,7 +54,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_TAO_OBJECTKEY_CS_) @@ -254,27 +254,27 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = + TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (const_cast<TAO::ObjectKey *> (&_tao_sequence)); if (_tao_octet_seq->mb ()) return strm.write_octet_array_mb (_tao_octet_seq->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 false; } @@ -284,7 +284,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -294,18 +294,18 @@ CORBA::Boolean operator>> ( { return false; } - + // 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 true; } - + // Retrieve all the elements. - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (), ACE_Message_Block::DONT_DELETE)) @@ -315,7 +315,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 = 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); @@ -326,18 +326,18 @@ 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 false; } #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -381,4 +381,4 @@ CORBA::Boolean operator>> ( CORBA::Octet \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index acfca87f542..066b432c2ae 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -198,7 +198,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index 61dd5f08532..db92895767d 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -346,7 +346,7 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 93f1677851d..4ea5cc52a6c 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -134,7 +134,7 @@ CORBA::Exception *CORBA::PolicyError::_alloc (void) CORBA::Exception * CORBA::PolicyError::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::CORBA::PolicyError (*this), @@ -319,7 +319,7 @@ CORBA::Exception *CORBA::InvalidPolicies::_alloc (void) CORBA::Exception * CORBA::InvalidPolicies::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::CORBA::InvalidPolicies (*this), @@ -702,7 +702,7 @@ CORBA::Policy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { @@ -844,11 +844,11 @@ CORBA::PolicyManager::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -860,7 +860,7 @@ const char* CORBA::PolicyManager::_interface_repository_id (void) const CORBA::Boolean CORBA::PolicyManager::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -991,11 +991,11 @@ CORBA::PolicyCurrent::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1007,7 +1007,7 @@ const char* CORBA::PolicyCurrent::_interface_repository_id (void) const CORBA::Boolean CORBA::PolicyCurrent::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1141,7 +1141,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 10b2cf16623..2a6f352a225 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -314,7 +314,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 367b23c7072..23711693de1 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -162,11 +162,11 @@ CORBA::Pollable::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -178,7 +178,7 @@ const char* CORBA::Pollable::_interface_repository_id (void) const CORBA::Boolean CORBA::Pollable::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -297,11 +297,11 @@ CORBA::DIIPollable::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -313,7 +313,7 @@ const char* CORBA::DIIPollable::_interface_repository_id (void) const CORBA::Boolean CORBA::DIIPollable::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -408,7 +408,7 @@ CORBA::Exception *CORBA::PollableSet::NoPossiblePollable::_alloc (void) CORBA::Exception * CORBA::PollableSet::NoPossiblePollable::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::CORBA::PollableSet::NoPossiblePollable (*this), @@ -492,7 +492,7 @@ CORBA::Exception *CORBA::PollableSet::UnknownPollable::_alloc (void) CORBA::Exception * CORBA::PollableSet::UnknownPollable::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::CORBA::PollableSet::UnknownPollable (*this), @@ -596,11 +596,11 @@ CORBA::PollableSet::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -612,11 +612,11 @@ const char* CORBA::PollableSet::_interface_repository_id (void) const CORBA::Boolean CORBA::PollableSet::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 08524f7045a..2c9ef07a3e5 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -172,11 +172,11 @@ PortableInterceptor::Interceptor::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -188,7 +188,7 @@ const char* PortableInterceptor::Interceptor::_interface_repository_id (void) co CORBA::Boolean PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -254,7 +254,7 @@ CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void) CORBA::Exception * PortableInterceptor::ForwardRequest::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableInterceptor::ForwardRequest (*this), @@ -444,7 +444,7 @@ CORBA::Exception *PortableInterceptor::InvalidSlot::_alloc (void) CORBA::Exception * PortableInterceptor::InvalidSlot::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableInterceptor::InvalidSlot (*this), @@ -654,11 +654,11 @@ PortableInterceptor::Current::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -670,7 +670,7 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const CORBA::Boolean PortableInterceptor::Current::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -793,11 +793,11 @@ PortableInterceptor::RequestInfo::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -809,7 +809,7 @@ const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) co CORBA::Boolean PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -936,11 +936,11 @@ PortableInterceptor::ClientRequestInfo::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -952,7 +952,7 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo CORBA::Boolean PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1079,11 +1079,11 @@ PortableInterceptor::ServerRequestInfo::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1095,7 +1095,7 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo CORBA::Boolean PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1222,11 +1222,11 @@ PortableInterceptor::ClientRequestInterceptor::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1238,7 +1238,7 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository CORBA::Boolean PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1365,11 +1365,11 @@ PortableInterceptor::ServerRequestInterceptor::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1381,7 +1381,7 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository CORBA::Boolean PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1504,11 +1504,11 @@ PortableInterceptor::PolicyFactory::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1520,7 +1520,7 @@ const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) CORBA::Boolean PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1624,7 +1624,7 @@ CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void) CORBA::Exception * PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableInterceptor::ORBInitInfo::DuplicateName (*this), @@ -1782,7 +1782,7 @@ CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void) CORBA::Exception * PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableInterceptor::ORBInitInfo::InvalidName (*this), @@ -1938,11 +1938,11 @@ PortableInterceptor::ORBInitInfo::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1954,7 +1954,7 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co CORBA::Boolean PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) { - return 0; + return false; } // Hand-crafted. @@ -2089,11 +2089,11 @@ PortableInterceptor::ORBInitializer::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -2105,7 +2105,7 @@ const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void) CORBA::Boolean PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -2164,7 +2164,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp index 01b3d748208..b4e70db3d7f 100644 --- a/TAO/tao/RTCORBA/RTCORBAA.cpp +++ b/TAO/tao/RTCORBA/RTCORBAA.cpp @@ -40,20 +40,20 @@ static const CORBA::Long _oc_RTCORBA_NativePriority[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x4e617469), - ACE_NTOHL (0x76655072), - ACE_NTOHL (0x696f7269), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x4e617469), + ACE_NTOHL (0x76655072), + ACE_NTOHL (0x696f7269), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0 15, - ACE_NTOHL (0x4e617469), - ACE_NTOHL (0x76655072), - ACE_NTOHL (0x696f7269), + ACE_NTOHL (0x4e617469), + ACE_NTOHL (0x76655072), + ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74790000), // name = NativePriority CORBA::tk_short, @@ -80,18 +80,18 @@ static const CORBA::Long _oc_RTCORBA_Priority[] = { 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 (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 (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, @@ -118,20 +118,20 @@ static const CORBA::Long _oc_RTCORBA_NetworkPriority[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x4e657477), - ACE_NTOHL (0x6f726b50), - ACE_NTOHL (0x72696f72), - ACE_NTOHL (0x6974793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x4e657477), + ACE_NTOHL (0x6f726b50), + ACE_NTOHL (0x72696f72), + ACE_NTOHL (0x6974793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0 16, - ACE_NTOHL (0x4e657477), - ACE_NTOHL (0x6f726b50), - ACE_NTOHL (0x72696f72), + ACE_NTOHL (0x4e657477), + ACE_NTOHL (0x6f726b50), + ACE_NTOHL (0x72696f72), ACE_NTOHL (0x69747900), // name = NetworkPriority CORBA::tk_long, @@ -158,20 +158,20 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0 13, - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4964), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4964), ACE_NTOHL (0x0), // name = ThreadpoolId CORBA::tk_ulong, diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index f80f03d7d72..2002a22e02c 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -260,11 +260,11 @@ RTCORBA::PriorityModelPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -276,7 +276,7 @@ const char* RTCORBA::PriorityModelPolicy::_interface_repository_id (void) const CORBA::Boolean RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -403,11 +403,11 @@ RTCORBA::ThreadpoolPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -419,7 +419,7 @@ const char* RTCORBA::ThreadpoolPolicy::_interface_repository_id (void) const CORBA::Boolean RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -542,11 +542,11 @@ RTCORBA::ProtocolProperties::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -558,7 +558,7 @@ const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const CORBA::Boolean RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -751,11 +751,11 @@ RTCORBA::ServerProtocolPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -767,7 +767,7 @@ const char* RTCORBA::ServerProtocolPolicy::_interface_repository_id (void) const CORBA::Boolean RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -894,11 +894,11 @@ RTCORBA::ClientProtocolPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -910,7 +910,7 @@ const char* RTCORBA::ClientProtocolPolicy::_interface_repository_id (void) const CORBA::Boolean RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1037,11 +1037,11 @@ RTCORBA::PrivateConnectionPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1053,7 +1053,7 @@ const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) co CORBA::Boolean RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1180,11 +1180,11 @@ RTCORBA::TCPProtocolProperties::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1196,7 +1196,7 @@ const char* RTCORBA::TCPProtocolProperties::_interface_repository_id (void) cons CORBA::Boolean RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1323,11 +1323,11 @@ RTCORBA::GIOPProtocolProperties::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1339,7 +1339,7 @@ const char* RTCORBA::GIOPProtocolProperties::_interface_repository_id (void) con CORBA::Boolean RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1466,11 +1466,11 @@ RTCORBA::UnixDomainProtocolProperties::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1482,7 +1482,7 @@ const char* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (voi CORBA::Boolean RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1609,11 +1609,11 @@ RTCORBA::SharedMemoryProtocolProperties::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1625,7 +1625,7 @@ const char* RTCORBA::SharedMemoryProtocolProperties::_interface_repository_id (v CORBA::Boolean RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1752,11 +1752,11 @@ RTCORBA::UserDatagramProtocolProperties::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1768,7 +1768,7 @@ const char* RTCORBA::UserDatagramProtocolProperties::_interface_repository_id (v CORBA::Boolean RTCORBA::UserDatagramProtocolProperties::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -1895,11 +1895,11 @@ RTCORBA::StreamControlProtocolProperties::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1911,7 +1911,7 @@ const char* RTCORBA::StreamControlProtocolProperties::_interface_repository_id ( CORBA::Boolean RTCORBA::StreamControlProtocolProperties::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -2104,11 +2104,11 @@ RTCORBA::PriorityBandedConnectionPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -2120,7 +2120,7 @@ const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (v CORBA::Boolean RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -2247,11 +2247,11 @@ RTCORBA::Current::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -2263,7 +2263,7 @@ const char* RTCORBA::Current::_interface_repository_id (void) const CORBA::Boolean RTCORBA::Current::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -2386,11 +2386,11 @@ RTCORBA::Mutex::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -2402,7 +2402,7 @@ const char* RTCORBA::Mutex::_interface_repository_id (void) const CORBA::Boolean RTCORBA::Mutex::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -2504,7 +2504,7 @@ CORBA::Exception *RTCORBA::RTORB::MutexNotFound::_alloc (void) CORBA::Exception * RTCORBA::RTORB::MutexNotFound::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::RTCORBA::RTORB::MutexNotFound (*this), @@ -2636,7 +2636,7 @@ CORBA::Exception *RTCORBA::RTORB::InvalidThreadpool::_alloc (void) CORBA::Exception * RTCORBA::RTORB::InvalidThreadpool::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::RTCORBA::RTORB::InvalidThreadpool (*this), @@ -2791,11 +2791,11 @@ RTCORBA::RTORB::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -2807,7 +2807,7 @@ const char* RTCORBA::RTORB::_interface_repository_id (void) const CORBA::Boolean RTCORBA::RTORB::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -3025,7 +3025,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/RTCORBA/diffs/RTCORBA.diff b/TAO/tao/RTCORBA/diffs/RTCORBA.diff index a2662c9a1f0..39802b80c63 100644 --- a/TAO/tao/RTCORBA/diffs/RTCORBA.diff +++ b/TAO/tao/RTCORBA/diffs/RTCORBA.diff @@ -1,5 +1,5 @@ ---- orig/RTCORBAC.h 2005-02-14 15:03:04.020758700 +0100 -+++ RTCORBAC.h 2005-02-14 15:03:04.321190700 +0100 +--- orig/RTCORBAC.h 2005-02-18 12:15:48.103436800 +0100 ++++ RTCORBAC.h 2005-02-18 12:15:48.443926400 +0100 @@ -36,12 +36,18 @@ #include "ace/config-all.h" @@ -48,8 +48,8 @@ protected: // Abstract or local interface only. ProtocolProperties (void); ---- orig/RTCORBAC.cpp 2005-02-14 15:03:04.020758700 +0100 -+++ RTCORBAC.cpp 2005-02-14 15:03:04.331205100 +0100 +--- orig/RTCORBAC.cpp 2005-02-18 12:15:48.103436800 +0100 ++++ RTCORBAC.cpp 2005-02-18 12:15:48.453940800 +0100 @@ -29,7 +29,7 @@ // be\be_codegen.cpp:302 @@ -82,8 +82,8 @@ // TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 ---- orig/RTCORBAA.cpp 2005-02-14 15:03:04.020758700 +0100 -+++ RTCORBAA.cpp 2005-02-14 15:03:29.016701100 +0100 +--- orig/RTCORBAA.cpp 2005-02-18 12:15:48.103436800 +0100 ++++ RTCORBAA.cpp 2005-02-18 12:15:48.473969600 +0100 @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index c3b8e885827..c17f38b5e95 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -175,11 +175,11 @@ RTPortableServer::POA::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -191,11 +191,11 @@ const char* RTPortableServer::POA::_interface_repository_id (void) const CORBA::Boolean RTPortableServer::POA::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp index 25b7622a133..dc43a7f1388 100644 --- a/TAO/tao/RTScheduling/RTSchedulerA.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp @@ -35,19 +35,19 @@ static const CORBA::Long _oc_RTScheduling_ThreadAction[] = { TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x52545363), - ACE_NTOHL (0x68656475), - ACE_NTOHL (0x6c696e67), - ACE_NTOHL (0x2f546872), - ACE_NTOHL (0x65616441), - ACE_NTOHL (0x6374696f), - ACE_NTOHL (0x6e3a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x52545363), + ACE_NTOHL (0x68656475), + ACE_NTOHL (0x6c696e67), + ACE_NTOHL (0x2f546872), + ACE_NTOHL (0x65616441), + ACE_NTOHL (0x6374696f), + ACE_NTOHL (0x6e3a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:RTScheduling/ThreadAction:1.0 13, - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x61644163), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x61644163), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ThreadAction }; @@ -72,30 +72,30 @@ static const CORBA::Long _oc_RTScheduling_DistributableThread_DT_State[] = { TAO_ENCAP_BYTE_ORDER, // byte order 50, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x52545363), - ACE_NTOHL (0x68656475), - ACE_NTOHL (0x6c696e67), - ACE_NTOHL (0x2f446973), - ACE_NTOHL (0x74726962), - ACE_NTOHL (0x75746162), - ACE_NTOHL (0x6c655468), - ACE_NTOHL (0x72656164), - ACE_NTOHL (0x2f44545f), - ACE_NTOHL (0x53746174), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x52545363), + ACE_NTOHL (0x68656475), + ACE_NTOHL (0x6c696e67), + ACE_NTOHL (0x2f446973), + ACE_NTOHL (0x74726962), + ACE_NTOHL (0x75746162), + ACE_NTOHL (0x6c655468), + ACE_NTOHL (0x72656164), + ACE_NTOHL (0x2f44545f), + ACE_NTOHL (0x53746174), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:RTScheduling/DistributableThread/DT_State:1.0 9, - ACE_NTOHL (0x44545f53), - ACE_NTOHL (0x74617465), + ACE_NTOHL (0x44545f53), + ACE_NTOHL (0x74617465), ACE_NTOHL (0x0), // name = DT_State 2, // member count 7, - ACE_NTOHL (0x41435449), + ACE_NTOHL (0x41435449), ACE_NTOHL (0x56450000), // name = ACTIVE 10, - ACE_NTOHL (0x43414e43), - ACE_NTOHL (0x454c4c45), + ACE_NTOHL (0x43414e43), + ACE_NTOHL (0x454c4c45), ACE_NTOHL (0x44000000), // name = CANCELLED }; @@ -117,22 +117,22 @@ static const CORBA::Long _oc_RTScheduling_DistributableThread[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x52545363), - ACE_NTOHL (0x68656475), - ACE_NTOHL (0x6c696e67), - ACE_NTOHL (0x2f446973), - ACE_NTOHL (0x74726962), - ACE_NTOHL (0x75746162), - ACE_NTOHL (0x6c655468), - ACE_NTOHL (0x72656164), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x52545363), + ACE_NTOHL (0x68656475), + ACE_NTOHL (0x6c696e67), + ACE_NTOHL (0x2f446973), + ACE_NTOHL (0x74726962), + ACE_NTOHL (0x75746162), + ACE_NTOHL (0x6c655468), + ACE_NTOHL (0x72656164), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:RTScheduling/DistributableThread:1.0 20, - ACE_NTOHL (0x44697374), - ACE_NTOHL (0x72696275), - ACE_NTOHL (0x7461626c), - ACE_NTOHL (0x65546872), + ACE_NTOHL (0x44697374), + ACE_NTOHL (0x72696275), + ACE_NTOHL (0x7461626c), + ACE_NTOHL (0x65546872), ACE_NTOHL (0x65616400), // name = DistributableThread }; @@ -157,17 +157,17 @@ static const CORBA::Long _oc_RTScheduling_Current_IdType[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x52545363), - ACE_NTOHL (0x68656475), - ACE_NTOHL (0x6c696e67), - ACE_NTOHL (0x2f437572), - ACE_NTOHL (0x72656e74), - ACE_NTOHL (0x2f496454), - ACE_NTOHL (0x7970653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x52545363), + ACE_NTOHL (0x68656475), + ACE_NTOHL (0x6c696e67), + ACE_NTOHL (0x2f437572), + ACE_NTOHL (0x72656e74), + ACE_NTOHL (0x2f496454), + ACE_NTOHL (0x7970653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:RTScheduling/Current/IdType:1.0 7, - ACE_NTOHL (0x49645479), + ACE_NTOHL (0x49645479), ACE_NTOHL (0x70650000), // name = IdType CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -196,8 +196,8 @@ static const CORBA::Long _oc_RTScheduling_Current_NameList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x52545363), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x52545363), ACE_NTOHL (0x68656475), ACE_NTOHL (0x6c696e67), ACE_NTOHL (0x2f437572), diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index ed71593d7ca..6ed2f21ddf3 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -184,11 +184,11 @@ RTScheduling::ThreadAction::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -200,7 +200,7 @@ const char* RTScheduling::ThreadAction::_interface_repository_id (void) const CORBA::Boolean RTScheduling::ThreadAction::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -315,11 +315,11 @@ RTScheduling::DistributableThread::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -331,7 +331,7 @@ const char* RTScheduling::DistributableThread::_interface_repository_id (void) c CORBA::Boolean RTScheduling::DistributableThread::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -426,7 +426,7 @@ CORBA::Exception *RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_all CORBA::Exception * RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE (*this), @@ -671,11 +671,11 @@ RTScheduling::Current::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -687,7 +687,7 @@ const char* RTScheduling::Current::_interface_repository_id (void) const CORBA::Boolean RTScheduling::Current::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -806,11 +806,11 @@ RTScheduling::ResourceManager::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -822,7 +822,7 @@ const char* RTScheduling::ResourceManager::_interface_repository_id (void) const CORBA::Boolean RTScheduling::ResourceManager::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -917,7 +917,7 @@ CORBA::Exception *RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES:: CORBA::Exception * RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES (*this), @@ -1073,11 +1073,11 @@ RTScheduling::Scheduler::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1089,11 +1089,11 @@ const char* RTScheduling::Scheduler::_interface_repository_id (void) const CORBA::Boolean RTScheduling::Scheduler::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/RTScheduling/diffs/RTScheduler.diff b/TAO/tao/RTScheduling/diffs/RTScheduler.diff index 4e7479e6b2d..3b20ba20c2d 100644 --- a/TAO/tao/RTScheduling/diffs/RTScheduler.diff +++ b/TAO/tao/RTScheduling/diffs/RTScheduler.diff @@ -1,5 +1,5 @@ ---- orig/RTSchedulerC.h 2005-02-14 15:00:39.953600300 +0100 -+++ RTSchedulerC.h 2005-02-14 15:00:40.133859500 +0100 +--- orig/RTSchedulerC.h 2005-02-18 12:26:10.608555200 +0100 ++++ RTSchedulerC.h 2005-02-18 12:26:10.898972800 +0100 @@ -54,6 +54,10 @@ #include "tao/PortableServer/PortableServer_includeC.h" #include "tao/PortableInterceptorC.h" @@ -21,8 +21,8 @@ } // module CORBA // TAO_IDL - Generated from ---- orig/RTSchedulerC.cpp 2005-02-14 15:00:39.953600300 +0100 -+++ RTSchedulerC.cpp 2005-02-14 15:00:40.153888300 +0100 +--- orig/RTSchedulerC.cpp 2005-02-18 12:26:10.608555200 +0100 ++++ RTSchedulerC.cpp 2005-02-18 12:26:10.919001600 +0100 @@ -29,7 +29,7 @@ // be\be_codegen.cpp:302 @@ -32,8 +32,8 @@ #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "tao/Typecode.h" ---- orig/RTSchedulerA.cpp 2005-02-14 15:00:39.953600300 +0100 -+++ RTSchedulerA.cpp 2005-02-14 15:00:53.903659500 +0100 +--- orig/RTSchedulerA.cpp 2005-02-18 12:26:10.608555200 +0100 ++++ RTSchedulerA.cpp 2005-02-18 12:26:10.919001600 +0100 @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index a08a6b3758e..e695c1bf8e9 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -359,7 +359,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp index fef6d6ceb63..463a6d18b49 100644 --- a/TAO/tao/ShortSeqC.cpp +++ b/TAO/tao/ShortSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 1c4b42c09f7..48b6bad7fa9 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -170,7 +170,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 1342ee8c09c..b63e16f3d7d 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -187,11 +187,11 @@ TAO::BufferingConstraintPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -203,7 +203,7 @@ const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) cons CORBA::Boolean TAO::BufferingConstraintPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -234,7 +234,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index cb1686062ca..d86a2aa7cb1 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -126,7 +126,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp new file mode 100644 index 00000000000..3d7628d0764 --- /dev/null +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp @@ -0,0 +1,155 @@ +// -*- 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/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "TypeCodeFactoryC.h" +#include "tao/Typecode.h" +#include "tao/CDR.h" +#include "tao/Any.h" +#include "tao/Any_Impl_T.h" + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:295 + +static const CORBA::Long _oc_CORBA_TypeCodeFactory[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 38, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5479), + ACE_NTOHL (0x7065436f), + ACE_NTOHL (0x64654661), + ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x793a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/TypeCodeFactory:1.0 + 16, + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x46616374), + ACE_NTOHL (0x6f727900), // name = TypeCodeFactory + }; + +static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeCodeFactory ( + CORBA::tk_objref, + sizeof (_oc_CORBA_TypeCodeFactory), + (char *) &_oc_CORBA_TypeCodeFactory, + 0, + 0 + ); + +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_TypeCodeFactory = + &_tc_TAO_tc_CORBA_TypeCodeFactory; +} + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<CORBA::TypeCodeFactory>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const +{ + _tao_elem = CORBA::Object::_duplicate (this->value_); + return 1; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &) +{ + return false; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &) +{ + return false; +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + CORBA::TypeCodeFactory_ptr _tao_elem + ) +{ + CORBA::TypeCodeFactory_ptr _tao_objptr = + CORBA::TypeCodeFactory::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + CORBA::TypeCodeFactory_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<CORBA::TypeCodeFactory>::insert ( + _tao_any, + CORBA::TypeCodeFactory::_tao_any_destructor, + CORBA::_tc_TypeCodeFactory, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + CORBA::TypeCodeFactory_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<CORBA::TypeCodeFactory>::extract ( + _tao_any, + CORBA::TypeCodeFactory::_tao_any_destructor, + CORBA::_tc_TypeCodeFactory, + _tao_elem + ); +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO::Any_Impl_T< + CORBA::TypeCodeFactory + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO::Any_Impl_T< \ + CORBA::TypeCodeFactory \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index 45f9c2dbda9..458e547c002 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -31,7 +31,6 @@ #include "TypeCodeFactoryC.h" #include "tao/CDR.h" -#include "tao/Any_Impl_T.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -171,11 +170,11 @@ CORBA::TypeCodeFactory::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -187,118 +186,11 @@ const char* CORBA::TypeCodeFactory::_interface_repository_id (void) const CORBA::Boolean CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &) { - return 0; -} - -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_CORBA_TypeCodeFactory[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5479), - ACE_NTOHL (0x7065436f), - ACE_NTOHL (0x64654661), - ACE_NTOHL (0x63746f72), - ACE_NTOHL (0x793a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/TypeCodeFactory:1.0 - 16, - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x46616374), - ACE_NTOHL (0x6f727900), // name = TypeCodeFactory - }; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeCodeFactory ( - CORBA::tk_objref, - sizeof (_oc_CORBA_TypeCodeFactory), - (char *) &_oc_CORBA_TypeCodeFactory, - 0, - 0 - ); - -namespace CORBA -{ - ::CORBA::TypeCode_ptr _tc_TypeCodeFactory = - &_tc_TAO_tc_CORBA_TypeCodeFactory; -} - -// TAO_IDL - Generated from -// be\be_visitor_interface/any_op_cs.cpp:50 - -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Impl_T<CORBA::TypeCodeFactory>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &) -{ return false; } -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &) -{ - return false; -} - -// Copying insertion. -void -operator<<= ( - CORBA::Any &_tao_any, - CORBA::TypeCodeFactory_ptr _tao_elem - ) -{ - CORBA::TypeCodeFactory_ptr _tao_objptr = - CORBA::TypeCodeFactory::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -// Non-copying insertion. -void -operator<<= ( - CORBA::Any &_tao_any, - CORBA::TypeCodeFactory_ptr *_tao_elem - ) -{ - TAO::Any_Impl_T<CORBA::TypeCodeFactory>::insert ( - _tao_any, - CORBA::TypeCodeFactory::_tao_any_destructor, - CORBA::_tc_TypeCodeFactory, - *_tao_elem - ); -} - -CORBA::Boolean -operator>>= ( - const CORBA::Any &_tao_any, - CORBA::TypeCodeFactory_ptr &_tao_elem - ) -{ - return - TAO::Any_Impl_T<CORBA::TypeCodeFactory>::extract ( - _tao_any, - CORBA::TypeCodeFactory::_tao_any_destructor, - CORBA::_tc_TypeCodeFactory, - _tao_elem - ); -} - // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -317,11 +209,6 @@ operator>>= ( CORBA::TypeCodeFactory >; - template class - TAO::Any_Impl_T< - CORBA::TypeCodeFactory - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -339,9 +226,4 @@ operator>>= ( CORBA::TypeCodeFactory > -# pragma instantiate \ - TAO::Any_Impl_T< \ - CORBA::TypeCodeFactory \ - > - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactory.pidl.diff b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactory.pidl.diff deleted file mode 100644 index 609eb95a8d8..00000000000 --- a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactory.pidl.diff +++ /dev/null @@ -1,183 +0,0 @@ ---- orig/TypeCodeFactory.pidl Mon Apr 23 23:32:24 2001 -+++ TypeCodeFactory.pidl Mon Apr 23 23:31:30 2001 -@@ -57,113 +57,120 @@ - #ifndef _TYPECODEFACTORY_IDL_ - #define _TYPECODEFACTORY_IDL_ - --#include "tao/IFR_Client/orig/IFR_Extended.pidl" -+#include "tao/IFR_Client/IFR_Extended.pidl" - - #pragma prefix "omg.org" - -- local interface CORBA_TypeCodeFactory // PIDL -+module CORBA - { -- CORBA::TypeCode create_struct_tc ( -- in string id, -- in string name, -- in CORBA_StructMemberSeq members -+ typedef string Identifier; -+ typedef string RepositoryId; -+ typedef short ValueModifier; -+ -+ local interface TypeCodeFactory // PIDL -+ { -+ TypeCode create_struct_tc ( -+ in RepositoryId id, -+ in Identifier name, -+ in StructMemberSeq members - ); - -- CORBA::TypeCode create_union_tc ( -- in string id, -- in string name, -- in CORBA::TypeCode discriminator_type, -- in CORBA_UnionMemberSeq members -+ TypeCode create_union_tc ( -+ in RepositoryId id, -+ in Identifier name, -+ in TypeCode discriminator_type, -+ in UnionMemberSeq members - ); - -- CORBA::TypeCode create_enum_tc ( -- in string id, -- in string name, -- in CORBA_EnumMemberSeq members -+ TypeCode create_enum_tc ( -+ in RepositoryId id, -+ in Identifier name, -+ in EnumMemberSeq members - ); - -- CORBA::TypeCode create_alias_tc ( -- in string id, -- in string name, -- in CORBA::TypeCode original_type -+ TypeCode create_alias_tc ( -+ in RepositoryId id, -+ in Identifier name, -+ in TypeCode original_type - ); - -- CORBA::TypeCode create_exception_tc ( -- in string id, -- in string name, -- in CORBA_StructMemberSeq members -+ TypeCode create_exception_tc ( -+ in RepositoryId id, -+ in Identifier name, -+ in StructMemberSeq members - ); - -- CORBA::TypeCode create_interface_tc ( -- in string id, -- in string name -+ TypeCode create_interface_tc ( -+ in RepositoryId id, -+ in Identifier name - ); - -- CORBA::TypeCode create_string_tc ( -+ TypeCode create_string_tc ( - in unsigned long bound - ); - -- CORBA::TypeCode create_wstring_tc ( -+ TypeCode create_wstring_tc ( - in unsigned long bound - ); - -- CORBA::TypeCode create_fixed_tc ( -+ TypeCode create_fixed_tc ( - in unsigned short digits, - in unsigned short scale - ); - -- CORBA::TypeCode create_sequence_tc ( -+ TypeCode create_sequence_tc ( - in unsigned long bound, -- in CORBA::TypeCode element_type -+ in TypeCode element_type - ); - -- CORBA::TypeCode create_array_tc ( -+ TypeCode create_array_tc ( - in unsigned long length, -- in CORBA::TypeCode element_type -+ in TypeCode element_type - ); - -- CORBA::TypeCode create_value_tc ( -- in string id, -- in string name, -- in short type_modifier, -- in CORBA::TypeCode concrete_base, -- in CORBA_ValueMemberSeq members -+ TypeCode create_value_tc ( -+ in RepositoryId id, -+ in Identifier name, -+ in ValueModifier type_modifier, -+ in TypeCode concrete_base, -+ in ValueMemberSeq members - ); - -- CORBA::TypeCode create_value_box_tc ( -- in string id, -- in string name, -- in CORBA::TypeCode boxed_type -+ TypeCode create_value_box_tc ( -+ in RepositoryId id, -+ in Identifier name, -+ in TypeCode boxed_type - ); - -- CORBA::TypeCode create_native_tc ( -- in string id, -- in string name -+ TypeCode create_native_tc ( -+ in RepositoryId id, -+ in Identifier name - ); - -- CORBA::TypeCode create_recursive_tc ( -- in string id -+ TypeCode create_recursive_tc ( -+ in RepositoryId id - ); - -- CORBA::TypeCode create_abstract_interface_tc ( -- in string id, -- in string name -+ TypeCode create_abstract_interface_tc ( -+ in RepositoryId id, -+ in Identifier name - ); - -- CORBA::TypeCode create_local_interface_tc ( -- in string id, -- in string name -+ TypeCode create_local_interface_tc ( -+ in RepositoryId id, -+ in Identifier name - ); -- CORBA::TypeCode create_component_tc ( -- in string id, -- in string name -+ TypeCode create_component_tc ( -+ in RepositoryId id, -+ in Identifier name - ); - -- CORBA::TypeCode create_home_tc ( -- in string id, -- in string name -+ TypeCode create_home_tc ( -+ in RepositoryId id, -+ in Identifier name - ); - }; -+}; - - #pragma prefix "" - #endif // _TYPECODEFACTORY_IDL_ diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h index ac765cc7218..6fa50f8c3ff 100644 --- a/TAO/tao/Typecode_typesC.h +++ b/TAO/tao/Typecode_typesC.h @@ -71,13 +71,13 @@ namespace CORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum TCKind { tk_null, @@ -123,7 +123,7 @@ namespace CORBA // just be table lookups. It must always be the last enum value!! , TC_KIND_COUNT }; - + typedef TCKind &TCKind_out; // TAO_IDL - Generated from diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp index c3fe583ee53..c833a113e6d 100644 --- a/TAO/tao/ULongLongSeqC.cpp +++ b/TAO/tao/ULongLongSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp index 2c2fcc733b6..1caefb05c48 100644 --- a/TAO/tao/ULongSeqC.cpp +++ b/TAO/tao/ULongSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp index 92565b8ebf5..8ac40c392b7 100644 --- a/TAO/tao/UShortSeqC.cpp +++ b/TAO/tao/UShortSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp index 638bd294eea..aea40b92298 100644 --- a/TAO/tao/WCharSeqC.cpp +++ b/TAO/tao/WCharSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp index 6461f0baedb..4c977a755c6 100644 --- a/TAO/tao/WStringSeqC.cpp +++ b/TAO/tao/WStringSeqC.cpp @@ -170,7 +170,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index d6f756bfb92..9e4647de406 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -111,7 +111,7 @@ CORBA::Exception *CORBA::WrongTransaction::_alloc (void) CORBA::Exception * CORBA::WrongTransaction::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::CORBA::WrongTransaction (*this), @@ -218,7 +218,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/diffs/Domain.diff b/TAO/tao/diffs/Domain.diff index dc9c0df787f..cfaf7f47b07 100644 --- a/TAO/tao/diffs/Domain.diff +++ b/TAO/tao/diffs/Domain.diff @@ -1,5 +1,63 @@ ---- orig/DomainC.h 2005-02-11 12:21:05.659990400 +0100 -+++ DomainC.h 2005-02-11 12:58:02.918251200 +0100 +--- orig/DomainC.cpp 2005-02-18 11:42:40.695684800 +0100 ++++ DomainC.cpp 2005-02-18 12:07:00.775176000 +0100 +@@ -39,6 +39,10 @@ + #include "tao/Special_Basic_Arguments.h" + #include "ace/OS_NS_string.h" + ++#include "tao/ORB_Core.h" ++#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__ */ +@@ -50,6 +54,44 @@ + // TAO_IDL - Generated from + // be\be_visitor_arg_traits.cpp:66 + ++// TAO specific stuff. ++namespace CORBA ++{ ++ class InterfaceDef; ++ typedef InterfaceDef *InterfaceDef_ptr; ++ typedef TAO_Objref_Var_T<InterfaceDef> InterfaceDef_var; ++ typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out; ++} ++ ++#if TAO_HAS_INTERCEPTORS == 1 ++ ++ACE_TEMPLATE_SPECIALIZATION ++void ++TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p) ++{ ++ TAO_IFR_Client_Adapter *adapter = ++ ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( ++ TAO_ORB_Core::ifr_client_adapter_name () ++ ); ++ ++ adapter->interfacedef_any_insert (p.argument, this->x_); ++ p.mode = CORBA::PARAM_IN; ++} ++ ++#endif /* TAO_HAS_INTERCEPTORS */ ++ ++ACE_TEMPLATE_SPECIALIZATION ++CORBA::Boolean ++TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr) ++{ ++ TAO_IFR_Client_Adapter *adapter = ++ ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( ++ TAO_ORB_Core::ifr_client_adapter_name () ++ ); ++ ++ return adapter->interfacedef_cdr_insert (cdr, this->x_); ++} ++ + // Arg traits specializations. + namespace TAO + { +--- orig/DomainC.h 2005-02-18 11:42:40.695684800 +0100 ++++ DomainC.h 2005-02-18 11:42:54.145024000 +0100 @@ -51,7 +51,6 @@ #include "tao/Seq_Out_T.h" diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff index 608b5afb5a2..f452821df06 100644 --- a/TAO/tao/diffs/Object_Key.diff +++ b/TAO/tao/diffs/Object_Key.diff @@ -1,13 +1,5 @@ ---- orig/Object_KeyC.cpp 2005-02-16 21:43:09.756739200 +0100 -+++ Object_KeyC.cpp 2005-02-16 21:45:11.431699200 +0100 -@@ -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: +--- orig/Object_KeyC.cpp 2005-02-18 11:42:43.930336000 +0100 ++++ Object_KeyC.cpp 2005-02-18 11:42:54.325283200 +0100 @@ -41,6 +41,10 @@ #include "Object_KeyC.inl" #endif /* !defined INLINE */ @@ -170,16 +162,8 @@ #endif /* end #if !defined */ // TAO_IDL - Generated from ---- orig/Object_KeyC.h 2005-02-16 21:43:09.756739200 +0100 -+++ Object_KeyC.h 2005-02-16 21:44:04.235075200 +0100 -@@ -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: +--- orig/Object_KeyC.h 2005-02-18 11:42:43.930336000 +0100 ++++ Object_KeyC.h 2005-02-18 11:42:54.335297600 +0100 @@ -124,6 +124,25 @@ ) : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff index 720a4a431c9..d309e2dfe43 100644 --- a/TAO/tao/diffs/OctetSeq.diff +++ b/TAO/tao/diffs/OctetSeq.diff @@ -1,5 +1,5 @@ ---- orig/OctetSeqC.h 2004-11-24 10:45:07.787692800 +0100 -+++ OctetSeqC.h 2004-11-24 10:46:21.874224000 +0100 +--- orig/OctetSeqC.h 2005-02-18 11:42:33.865864000 +0100 ++++ OctetSeqC.h 2005-02-18 11:42:54.205110400 +0100 @@ -148,6 +148,18 @@ { } diff --git a/TAO/tao/diffs/Policy.diff b/TAO/tao/diffs/Policy.diff index bffdb569967..f7605fb7de9 100644 --- a/TAO/tao/diffs/Policy.diff +++ b/TAO/tao/diffs/Policy.diff @@ -1,14 +1,6 @@ ---- orig/PolicyC.h 2004-11-17 09:35:42.238198400 +0100 -+++ PolicyC.h 2004-11-17 09:35:50.159588800 +0100 -@@ -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: -@@ -334,6 +334,15 @@ +--- orig/PolicyC.h 2005-02-18 11:42:38.843020800 +0100 ++++ PolicyC.h 2005-02-18 11:42:53.904678400 +0100 +@@ -338,6 +338,15 @@ virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -24,18 +16,10 @@ private: TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; ---- orig/PolicyC.cpp 2004-11-17 09:35:42.238198400 +0100 -+++ PolicyC.cpp 2004-11-17 09:55:41.000000000 +0100 -@@ -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: -@@ -1118,6 +1118,34 @@ - } +--- orig/PolicyC.cpp 2005-02-18 11:42:38.843020800 +0100 ++++ PolicyC.cpp 2005-02-18 11:42:53.924707200 +0100 +@@ -1076,6 +1076,34 @@ + ); } +// Hand crafted. diff --git a/TAO/tao/diffs/Policy_Forward.diff b/TAO/tao/diffs/Policy_Forward.diff index 1739675e21d..5d5c6df277f 100644 --- a/TAO/tao/diffs/Policy_Forward.diff +++ b/TAO/tao/diffs/Policy_Forward.diff @@ -1,13 +1,5 @@ ---- orig/Policy_ForwardC.h 2004-11-24 14:19:29.301641600 +0100 -+++ Policy_ForwardC.h 2004-11-24 14:53:14.000000000 +0100 -@@ -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: +--- orig/Policy_ForwardC.h 2005-02-18 11:42:32.143387200 +0100 ++++ Policy_ForwardC.h 2005-02-18 11:42:54.245168000 +0100 @@ -41,7 +41,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff index 6da84cb45c0..d710ece0506 100644 --- a/TAO/tao/diffs/PortableInterceptor.diff +++ b/TAO/tao/diffs/PortableInterceptor.diff @@ -1,16 +1,8 @@ ---- orig/PortableInterceptorC.h 2004-11-15 10:52:20.574179200 +0100 -+++ PortableInterceptorC.h 2004-11-16 13:47:29.964508800 +0100 -@@ -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: -@@ -50,6 +50,12 @@ - - #include "tao/CurrentC.h" +--- orig/PortableInterceptorC.h 2005-02-18 11:42:29.499585600 +0100 ++++ PortableInterceptorC.h 2005-02-18 11:42:53.794520000 +0100 +@@ -57,6 +57,12 @@ + #include "tao/orb_typesC.h" + #include "tao/PolicyC.h" +#include "PI_ForwardC.h" +#include "tao/Messaging_SyncScopeC.h" @@ -21,7 +13,7 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -@@ -71,6 +77,15 @@ +@@ -78,6 +84,15 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ @@ -35,9 +27,9 @@ +} + // TAO_IDL - Generated from - // be\be_visitor_root/root_ch.cpp:63 + // be\be_visitor_root/root_ch.cpp:62 -@@ -1315,17 +1330,19 @@ +@@ -1326,17 +1341,19 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -60,7 +52,7 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 -@@ -1472,6 +1489,16 @@ +@@ -1483,6 +1500,16 @@ static void _tao_any_destructor (void *); @@ -77,46 +69,10 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 -@@ -2144,27 +2171,6 @@ - - #endif /* end #if !defined */ - --#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_) --#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_ -- -- ACE_TEMPLATE_SPECIALIZATION -- struct TAO_Export Objref_Traits< ::PortableInterceptor::IORInterceptor> -- { -- static ::PortableInterceptor::IORInterceptor_ptr duplicate ( -- ::PortableInterceptor::IORInterceptor_ptr -- ); -- static void release ( -- ::PortableInterceptor::IORInterceptor_ptr -- ); -- static ::PortableInterceptor::IORInterceptor_ptr nil (void); -- static CORBA::Boolean marshal ( -- ::PortableInterceptor::IORInterceptor_ptr p, -- TAO_OutputCDR & cdr -- ); -- }; -- --#endif /* end #if !defined */ -- - #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_) - #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_ - ---- orig/PortableInterceptorC.cpp 2004-11-15 10:52:20.574179200 +0100 -+++ PortableInterceptorC.cpp 2004-11-15 10:57:37.000000000 +0100 -@@ -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: -@@ -2015,6 +2015,18 @@ - return 0; +--- orig/PortableInterceptorC.cpp 2005-02-18 11:42:29.499585600 +0100 ++++ PortableInterceptorC.cpp 2005-02-18 11:42:53.834577600 +0100 +@@ -1957,6 +1957,18 @@ + return false; } +// Hand-crafted. diff --git a/TAO/tao/diffs/Typecode_types.diff b/TAO/tao/diffs/Typecode_types.diff index 43ee8a1e47c..680ac0833f7 100644 --- a/TAO/tao/diffs/Typecode_types.diff +++ b/TAO/tao/diffs/Typecode_types.diff @@ -1,5 +1,5 @@ ---- orig/Typecode_typesC.h 2005-02-11 12:21:03.236505600 +0100 -+++ Typecode_typesC.h 2005-02-11 12:22:23.181460800 +0100 +--- orig/Typecode_typesC.h 2005-02-18 11:42:38.332286400 +0100 ++++ Typecode_typesC.h 2005-02-18 11:42:54.004822400 +0100 @@ -75,26 +75,6 @@ // TAO_IDL - Generated from // be\be_interface.cpp:598 diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff index f10510e70c4..d8b43627b8d 100644 --- a/TAO/tao/diffs/UShortSeq.diff +++ b/TAO/tao/diffs/UShortSeq.diff @@ -1,13 +1,5 @@ ---- orig/UShortSeqC.h 2004-11-17 09:35:38.102251200 +0100 -+++ UShortSeqC.h 2004-11-17 09:55:41.000000000 +0100 -@@ -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: +--- orig/UShortSeqC.h 2005-02-18 11:42:34.827246400 +0100 ++++ UShortSeqC.h 2005-02-18 11:42:54.064908800 +0100 @@ -140,6 +140,18 @@ { } |