diff options
180 files changed, 1260 insertions, 991 deletions
diff --git a/TAO/tao/AnySeqA.cpp b/TAO/tao/AnySeqA.cpp index 9ecd3361be1..a65dccbc580 100644 --- a/TAO/tao/AnySeqA.cpp +++ b/TAO/tao/AnySeqA.cpp @@ -68,7 +68,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AnySeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_AnySeq = + ::CORBA::TypeCode_ptr const _tc_AnySeq = &_tc_TAO_tc_CORBA_AnySeq; } diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp index 0a818e79d32..dcd82e5d152 100644 --- a/TAO/tao/AnySeqC.cpp +++ b/TAO/tao/AnySeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -175,7 +175,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h index 00474554d60..11f19a12ee6 100644 --- a/TAO/tao/AnySeqC.h +++ b/TAO/tao/AnySeqC.h @@ -126,7 +126,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AnySeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_AnySeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp index 289291f2f79..ba72d41034f 100644 --- a/TAO/tao/BooleanSeqA.cpp +++ b/TAO/tao/BooleanSeqA.cpp @@ -70,7 +70,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_BooleanSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_BooleanSeq = + ::CORBA::TypeCode_ptr const _tc_BooleanSeq = &_tc_TAO_tc_CORBA_BooleanSeq; } diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp index be30335fffc..51f4e4f3afa 100644 --- a/TAO/tao/BooleanSeqC.cpp +++ b/TAO/tao/BooleanSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h index b03e18df8e2..34cba8bec28 100644 --- a/TAO/tao/BooleanSeqC.h +++ b/TAO/tao/BooleanSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BooleanSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_BooleanSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index 337aa508bcd..02484941dde 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -44,7 +44,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -188,7 +188,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_Bounds = + ::CORBA::TypeCode_ptr const _tc_Bounds = &_tc_TAO_tc_CORBA_Bounds; } @@ -213,7 +213,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h index 02239c4c295..ce1279180f6 100644 --- a/TAO/tao/BoundsC.h +++ b/TAO/tao/BoundsC.h @@ -117,7 +117,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Bounds; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Bounds; #endif /* end #if !defined */ diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp index 0580ac7cb9f..246eec72483 100644 --- a/TAO/tao/CONV_FRAMEA.cpp +++ b/TAO/tao/CONV_FRAMEA.cpp @@ -66,7 +66,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId ( namespace CONV_FRAME { - ::CORBA::TypeCode_ptr _tc_CodeSetId = + ::CORBA::TypeCode_ptr const _tc_CodeSetId = &_tc_TAO_tc_CONV_FRAME_CodeSetId; } @@ -130,7 +130,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetIdSeq ( namespace CONV_FRAME { - ::CORBA::TypeCode_ptr _tc_CodeSetIdSeq = + ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq = &_tc_TAO_tc_CONV_FRAME_CodeSetIdSeq; } @@ -250,7 +250,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent ( namespace CONV_FRAME { - ::CORBA::TypeCode_ptr _tc_CodeSetComponent = + ::CORBA::TypeCode_ptr const _tc_CodeSetComponent = &_tc_TAO_tc_CONV_FRAME_CodeSetComponent; } @@ -506,7 +506,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo ( namespace CONV_FRAME { - ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo = + ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo = &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo; } @@ -596,7 +596,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext ( namespace CONV_FRAME { - ::CORBA::TypeCode_ptr _tc_CodeSetContext = + ::CORBA::TypeCode_ptr const _tc_CodeSetContext = &_tc_TAO_tc_CONV_FRAME_CodeSetContext; } diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 205036a846f..3c0111a9172 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -269,7 +269,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index 315262b4e53..ac71fa4756a 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -84,7 +84,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetId; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -137,7 +137,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetIdSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -172,7 +172,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetComponent; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -207,7 +207,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -239,7 +239,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetContext; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp index a49f833de0c..6f32597772b 100644 --- a/TAO/tao/CharSeqA.cpp +++ b/TAO/tao/CharSeqA.cpp @@ -68,7 +68,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_CharSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_CharSeq = + ::CORBA::TypeCode_ptr const _tc_CharSeq = &_tc_TAO_tc_CORBA_CharSeq; } diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp index 6e72f0c3bd8..23f3c5378df 100644 --- a/TAO/tao/CharSeqC.cpp +++ b/TAO/tao/CharSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h index 29a5bc3df9a..d3ce2b0a2fd 100644 --- a/TAO/tao/CharSeqC.h +++ b/TAO/tao/CharSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CharSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CharSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp index 53643ccffab..4fd6e63d47e 100644 --- a/TAO/tao/CurrentA.cpp +++ b/TAO/tao/CurrentA.cpp @@ -61,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Current ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_Current = + ::CORBA::TypeCode_ptr const _tc_Current = &_tc_TAO_tc_CORBA_Current; } diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 848794ad85a..6f5e5841da7 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -55,7 +55,6 @@ namespace TAO // Traits specializations for CORBA::Current. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Current_ptr TAO::Objref_Traits<CORBA::Current>::duplicate ( CORBA::Current_ptr p @@ -64,7 +63,6 @@ TAO::Objref_Traits<CORBA::Current>::duplicate ( return CORBA::Current::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<CORBA::Current>::release ( CORBA::Current_ptr p @@ -73,14 +71,12 @@ TAO::Objref_Traits<CORBA::Current>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Current_ptr TAO::Objref_Traits<CORBA::Current>::nil (void) { return CORBA::Current::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<CORBA::Current>::marshal ( CORBA::Current_ptr p, @@ -149,6 +145,12 @@ CORBA::Current::_duplicate (Current_ptr obj) return obj; } +void +CORBA::Current::_tao_release (Current_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean CORBA::Current::_is_a ( const char *value @@ -190,7 +192,7 @@ CORBA::Current::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index 351feaf0542..82fb846831d 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -123,6 +123,8 @@ namespace CORBA // The static operations. static Current_ptr _duplicate (Current_ptr obj); + static void _tao_release (Current_ptr obj); + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -141,7 +143,7 @@ namespace CORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -169,7 +171,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -186,7 +188,7 @@ namespace TAO #if !defined (_CORBA_CURRENT__TRAITS_CH_) #define _CORBA_CURRENT__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::CORBA::Current> { static ::CORBA::Current_ptr duplicate ( diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp index 14234ef080c..2d3c37dc429 100644 --- a/TAO/tao/DomainA.cpp +++ b/TAO/tao/DomainA.cpp @@ -65,7 +65,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_DomainManager = + ::CORBA::TypeCode_ptr const _tc_DomainManager = &_tc_TAO_tc_CORBA_DomainManager; } @@ -105,7 +105,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ConstructionPolicy = + ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy = &_tc_TAO_tc_CORBA_ConstructionPolicy; } @@ -168,7 +168,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_DomainManagerList = + ::CORBA::TypeCode_ptr const _tc_DomainManagerList = &_tc_TAO_tc_CORBA_DomainManagerList; } diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 147a36121a2..a488ad7b3b7 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -52,7 +52,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // TAO specific stuff. namespace CORBA @@ -98,8 +98,8 @@ namespace TAO #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) #define _CORBA_POLICY__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION + + template<> class TAO_Export Arg_Traits<CORBA::Policy> : public Object_Arg_Traits_T< @@ -115,8 +115,8 @@ namespace TAO #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_) #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION + + template<> class TAO_Export Arg_Traits<CORBA::InterfaceDef> : public Object_Arg_Traits_T< @@ -137,7 +137,6 @@ namespace TAO // Traits specializations for CORBA::DomainManager. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DomainManager_ptr TAO::Objref_Traits<CORBA::DomainManager>::duplicate ( CORBA::DomainManager_ptr p @@ -146,7 +145,6 @@ TAO::Objref_Traits<CORBA::DomainManager>::duplicate ( return CORBA::DomainManager::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<CORBA::DomainManager>::release ( CORBA::DomainManager_ptr p @@ -155,14 +153,12 @@ TAO::Objref_Traits<CORBA::DomainManager>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DomainManager_ptr TAO::Objref_Traits<CORBA::DomainManager>::nil (void) { return CORBA::DomainManager::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<CORBA::DomainManager>::marshal ( CORBA::DomainManager_ptr p, @@ -173,7 +169,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; @@ -193,21 +189,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, @@ -216,10 +212,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 (); } @@ -291,6 +287,12 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj) return obj; } +void +CORBA::DomainManager::_tao_release (DomainManager_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean CORBA::DomainManager::_is_a ( const char *value @@ -335,7 +337,6 @@ CORBA::DomainManager::marshal (TAO_OutputCDR &cdr) // Traits specializations for CORBA::ConstructionPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstructionPolicy_ptr TAO::Objref_Traits<CORBA::ConstructionPolicy>::duplicate ( CORBA::ConstructionPolicy_ptr p @@ -344,7 +345,6 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::duplicate ( return CORBA::ConstructionPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<CORBA::ConstructionPolicy>::release ( CORBA::ConstructionPolicy_ptr p @@ -353,14 +353,12 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstructionPolicy_ptr TAO::Objref_Traits<CORBA::ConstructionPolicy>::nil (void) { return CORBA::ConstructionPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal ( CORBA::ConstructionPolicy_ptr p, @@ -492,6 +490,12 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj) return obj; } +void +CORBA::ConstructionPolicy::_tao_release (ConstructionPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean CORBA::ConstructionPolicy::_is_a ( const char *value @@ -739,7 +743,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index f2c073079a9..b229c677848 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -130,6 +130,8 @@ namespace CORBA // The static operations. static DomainManager_ptr _duplicate (DomainManager_ptr obj); + static void _tao_release (DomainManager_ptr obj); + static DomainManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -159,7 +161,7 @@ namespace CORBA )); // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -207,7 +209,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManager; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_DomainManager; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -254,6 +256,8 @@ namespace CORBA // The static operations. static ConstructionPolicy_ptr _duplicate (ConstructionPolicy_ptr obj); + static void _tao_release (ConstructionPolicy_ptr obj); + static ConstructionPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -284,7 +288,7 @@ namespace CORBA )); // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -332,7 +336,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstructionPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -392,7 +396,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManagerList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_DomainManagerList; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -402,7 +406,7 @@ namespace CORBA // Proxy Broker Factory function pointer declarations. // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:120 +// be\be_visitor_root/root.cpp:230 extern TAO_Export TAO::Collocation_Proxy_Broker * @@ -426,7 +430,7 @@ namespace TAO #if !defined (_CORBA_DOMAINMANAGER__TRAITS_CH_) #define _CORBA_DOMAINMANAGER__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::CORBA::DomainManager> { static ::CORBA::DomainManager_ptr duplicate ( @@ -447,7 +451,7 @@ namespace TAO #if !defined (_CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_) #define _CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::CORBA::ConstructionPolicy> { static ::CORBA::ConstructionPolicy_ptr duplicate ( diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp index 9b272995c23..d6a187e0110 100644 --- a/TAO/tao/DoubleSeqA.cpp +++ b/TAO/tao/DoubleSeqA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DoubleSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_DoubleSeq = + ::CORBA::TypeCode_ptr const _tc_DoubleSeq = &_tc_TAO_tc_CORBA_DoubleSeq; } diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp index 2819eecbe44..e9bf319c44e 100644 --- a/TAO/tao/DoubleSeqC.cpp +++ b/TAO/tao/DoubleSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h index 9a385a29432..0f84bebfc70 100644 --- a/TAO/tao/DoubleSeqC.h +++ b/TAO/tao/DoubleSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DoubleSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_DoubleSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp index 04c35fd78a4..a948aa23174 100644 --- a/TAO/tao/DynamicA.cpp +++ b/TAO/tao/DynamicA.cpp @@ -130,7 +130,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList ( namespace Dynamic { - ::CORBA::TypeCode_ptr _tc_ParameterList = + ::CORBA::TypeCode_ptr const _tc_ParameterList = &_tc_TAO_tc_Dynamic_ParameterList; } @@ -190,7 +190,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList ( namespace Dynamic { - ::CORBA::TypeCode_ptr _tc_ContextList = + ::CORBA::TypeCode_ptr const _tc_ContextList = &_tc_TAO_tc_Dynamic_ContextList; } @@ -235,7 +235,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList ( namespace Dynamic { - ::CORBA::TypeCode_ptr _tc_ExceptionList = + ::CORBA::TypeCode_ptr const _tc_ExceptionList = &_tc_TAO_tc_Dynamic_ExceptionList; } @@ -297,7 +297,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext ( namespace Dynamic { - ::CORBA::TypeCode_ptr _tc_RequestContext = + ::CORBA::TypeCode_ptr const _tc_RequestContext = &_tc_TAO_tc_Dynamic_RequestContext; } diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index 9d04e20bb22..5a9d796c179 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -300,7 +300,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h index 5291af0d2e6..d533cfccfa0 100644 --- a/TAO/tao/DynamicC.h +++ b/TAO/tao/DynamicC.h @@ -130,7 +130,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ParameterList; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -142,7 +142,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ContextList; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -199,7 +199,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ExceptionList; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -211,7 +211,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestContext; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestContext; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp index 1b8a1e17db2..0effb99f813 100644 --- a/TAO/tao/Dynamic_ParameterA.cpp +++ b/TAO/tao/Dynamic_ParameterA.cpp @@ -103,7 +103,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter ( namespace Dynamic { - ::CORBA::TypeCode_ptr _tc_Parameter = + ::CORBA::TypeCode_ptr const _tc_Parameter = &_tc_TAO_tc_Dynamic_Parameter; } diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp index f0d9e08219b..3b4a860b2e9 100644 --- a/TAO/tao/Dynamic_ParameterC.cpp +++ b/TAO/tao/Dynamic_ParameterC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -86,7 +86,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h index d14cad28184..f366df973d8 100644 --- a/TAO/tao/Dynamic_ParameterC.h +++ b/TAO/tao/Dynamic_ParameterC.h @@ -108,7 +108,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Parameter; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp index 18bea7d535e..e1df4bac224 100644 --- a/TAO/tao/FloatSeqA.cpp +++ b/TAO/tao/FloatSeqA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_FloatSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_FloatSeq = + ::CORBA::TypeCode_ptr const _tc_FloatSeq = &_tc_TAO_tc_CORBA_FloatSeq; } diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp index d5066f9a574..2ee95575c8c 100644 --- a/TAO/tao/FloatSeqC.cpp +++ b/TAO/tao/FloatSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h index b778a616bc7..918104af517 100644 --- a/TAO/tao/FloatSeqC.h +++ b/TAO/tao/FloatSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FloatSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_FloatSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp index 245cc9f4ab3..30c6e492cf6 100644 --- a/TAO/tao/GIOPA.cpp +++ b/TAO/tao/GIOPA.cpp @@ -70,7 +70,7 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_AddressingDisposition ( namespace GIOP { - ::CORBA::TypeCode_ptr _tc_AddressingDisposition = + ::CORBA::TypeCode_ptr const _tc_AddressingDisposition = &_tc_TAO_tc_GIOP_AddressingDisposition; } @@ -115,7 +115,7 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_Version ( namespace GIOP { - ::CORBA::TypeCode_ptr _tc_Version = + ::CORBA::TypeCode_ptr const _tc_Version = &_tc_TAO_tc_GIOP_Version; } @@ -285,7 +285,7 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_IORAddressingInfo ( namespace GIOP { - ::CORBA::TypeCode_ptr _tc_IORAddressingInfo = + ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo = &_tc_TAO_tc_GIOP_IORAddressingInfo; } @@ -584,7 +584,7 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_TargetAddress ( namespace GIOP { - ::CORBA::TypeCode_ptr _tc_TargetAddress = + ::CORBA::TypeCode_ptr const _tc_TargetAddress = &_tc_TAO_tc_GIOP_TargetAddress; } diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index bd5e0044fbd..70030f1cf67 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -43,7 +43,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -391,7 +391,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index e2733bd5bdd..bd21b03e6c0 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -83,7 +83,7 @@ namespace GIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AddressingDisposition; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_AddressingDisposition; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -130,7 +130,7 @@ namespace GIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Version; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -165,7 +165,7 @@ namespace GIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORAddressingInfo; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -258,7 +258,7 @@ namespace GIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TargetAddress; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TargetAddress; #endif /* end #if !defined */ diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp index 2f780dc1951..490c6e05872 100644 --- a/TAO/tao/IIOPA.cpp +++ b/TAO/tao/IIOPA.cpp @@ -74,7 +74,7 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint ( namespace IIOP { - ::CORBA::TypeCode_ptr _tc_ListenPoint = + ::CORBA::TypeCode_ptr const _tc_ListenPoint = &_tc_TAO_tc_IIOP_ListenPoint; } @@ -146,7 +146,7 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList ( namespace IIOP { - ::CORBA::TypeCode_ptr _tc_ListenPointList = + ::CORBA::TypeCode_ptr const _tc_ListenPointList = &_tc_TAO_tc_IIOP_ListenPointList; } @@ -248,7 +248,7 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext ( namespace IIOP { - ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext = + ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext = &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext; } diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index b206754dbae..a9f64d4ff5b 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -245,7 +245,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index c238bbac166..29814d26b6e 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.h @@ -108,7 +108,7 @@ namespace IIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ListenPoint; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -161,7 +161,7 @@ namespace IIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ListenPointList; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -195,7 +195,7 @@ namespace IIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp index 478a3bd9abd..3af4281f9e2 100644 --- a/TAO/tao/IIOP_EndpointsA.cpp +++ b/TAO/tao/IIOP_EndpointsA.cpp @@ -81,7 +81,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IIOP_Endpoint_Info ( namespace TAO { - ::CORBA::TypeCode_ptr _tc_IIOP_Endpoint_Info = + ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info = &_tc_TAO_tc_TAO_IIOP_Endpoint_Info; } @@ -161,7 +161,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IIOPEndpointSequence ( namespace TAO { - ::CORBA::TypeCode_ptr _tc_IIOPEndpointSequence = + ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence = &_tc_TAO_tc_TAO_IIOPEndpointSequence; } diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp index 75c22ebce3e..5df80db71c0 100644 --- a/TAO/tao/IIOP_EndpointsC.cpp +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -213,7 +213,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h index 30ad5796ff9..47d03fff4bd 100644 --- a/TAO/tao/IIOP_EndpointsC.h +++ b/TAO/tao/IIOP_EndpointsC.h @@ -109,7 +109,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOP_Endpoint_Info; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -162,7 +162,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOPEndpointSequence; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 7653d00390a..ca2aaea88c1 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO diff --git a/TAO/tao/IOP_CodecA.cpp b/TAO/tao/IOP_CodecA.cpp index a5b9914a5df..beda068994e 100644 --- a/TAO/tao/IOP_CodecA.cpp +++ b/TAO/tao/IOP_CodecA.cpp @@ -61,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_Codec = + ::CORBA::TypeCode_ptr const _tc_Codec = &_tc_TAO_tc_IOP_Codec; } @@ -100,7 +100,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_EncodingFormat = + ::CORBA::TypeCode_ptr const _tc_EncodingFormat = &_tc_TAO_tc_IOP_EncodingFormat; } @@ -174,7 +174,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_Encoding = + ::CORBA::TypeCode_ptr const _tc_Encoding = &_tc_TAO_tc_IOP_Encoding; } @@ -211,7 +211,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_CodecFactory = + ::CORBA::TypeCode_ptr const _tc_CodecFactory = &_tc_TAO_tc_IOP_CodecFactory; } diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index 6287af6bb4f..ae1d2d4075e 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -44,7 +44,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -57,7 +57,6 @@ namespace TAO // Traits specializations for IOP::Codec. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::Codec_ptr TAO::Objref_Traits<IOP::Codec>::duplicate ( IOP::Codec_ptr p @@ -66,7 +65,6 @@ TAO::Objref_Traits<IOP::Codec>::duplicate ( return IOP::Codec::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<IOP::Codec>::release ( IOP::Codec_ptr p @@ -75,14 +73,12 @@ TAO::Objref_Traits<IOP::Codec>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::Codec_ptr TAO::Objref_Traits<IOP::Codec>::nil (void) { return IOP::Codec::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<IOP::Codec>::marshal ( IOP::Codec_ptr p, @@ -225,7 +221,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding ( 0 ); -::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding = +::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding = &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding; // TAO_IDL - Generated from @@ -357,7 +353,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch ( 0 ); -::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch = +::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch = &_tc_TAO_tc_IOP_Codec_FormatMismatch; // TAO_IDL - Generated from @@ -488,7 +484,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch ( 0 ); -::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch = +::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch = &_tc_TAO_tc_IOP_Codec_TypeMismatch; IOP::Codec::Codec (void) @@ -550,6 +546,12 @@ IOP::Codec::_duplicate (Codec_ptr obj) return obj; } +void +IOP::Codec::_tao_release (Codec_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean IOP::Codec::_is_a ( const char *value @@ -608,7 +610,6 @@ IOP::Encoding::_tao_any_destructor ( // Traits specializations for IOP::CodecFactory. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::CodecFactory_ptr TAO::Objref_Traits<IOP::CodecFactory>::duplicate ( IOP::CodecFactory_ptr p @@ -617,7 +618,6 @@ TAO::Objref_Traits<IOP::CodecFactory>::duplicate ( return IOP::CodecFactory::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<IOP::CodecFactory>::release ( IOP::CodecFactory_ptr p @@ -626,14 +626,12 @@ TAO::Objref_Traits<IOP::CodecFactory>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::CodecFactory_ptr TAO::Objref_Traits<IOP::CodecFactory>::nil (void) { return IOP::CodecFactory::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<IOP::CodecFactory>::marshal ( IOP::CodecFactory_ptr p, @@ -774,7 +772,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding ( 0 ); -::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding = +::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding = &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding; IOP::CodecFactory::CodecFactory (void) @@ -836,6 +834,12 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj) return obj; } +void +IOP::CodecFactory::_tao_release (CodecFactory_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean IOP::CodecFactory::_is_a ( const char *value diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h index 5a2a25650ac..518720d63e7 100644 --- a/TAO/tao/IOP_CodecC.h +++ b/TAO/tao/IOP_CodecC.h @@ -130,6 +130,8 @@ namespace IOP // The static operations. static Codec_ptr _duplicate (Codec_ptr obj); + static void _tao_release (Codec_ptr obj); + static Codec_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -193,7 +195,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding; + static ::CORBA::TypeCode_ptr const _tc_InvalidTypeForEncoding; #endif /* end #if !defined */ @@ -243,7 +245,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_FormatMismatch; + static ::CORBA::TypeCode_ptr const _tc_FormatMismatch; #endif /* end #if !defined */ @@ -293,7 +295,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_TypeMismatch; + static ::CORBA::TypeCode_ptr const _tc_TypeMismatch; #endif /* end #if !defined */ @@ -348,7 +350,7 @@ namespace IOP )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -376,7 +378,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Codec; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -387,7 +389,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_EncodingFormat; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -425,7 +427,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Encoding; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -466,6 +468,8 @@ namespace IOP // The static operations. static CodecFactory_ptr _duplicate (CodecFactory_ptr obj); + static void _tao_release (CodecFactory_ptr obj); + static CodecFactory_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -529,7 +533,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_UnknownEncoding; + static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding; #endif /* end #if !defined */ @@ -546,7 +550,7 @@ namespace IOP )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -574,7 +578,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodecFactory; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -591,7 +595,7 @@ namespace TAO #if !defined (_IOP_CODEC__TRAITS_CH_) #define _IOP_CODEC__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::IOP::Codec> { static ::IOP::Codec_ptr duplicate ( @@ -612,7 +616,7 @@ namespace TAO #if !defined (_IOP_CODECFACTORY__TRAITS_CH_) #define _IOP_CODECFACTORY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::IOP::CodecFactory> { static ::IOP::CodecFactory_ptr duplicate ( diff --git a/TAO/tao/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp index f319e909fa5..142bb7c58a3 100644 --- a/TAO/tao/IOP_IORA.cpp +++ b/TAO/tao/IOP_IORA.cpp @@ -64,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_ProfileId = + ::CORBA::TypeCode_ptr const _tc_ProfileId = &_tc_TAO_tc_IOP_ProfileId; } @@ -152,7 +152,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_TaggedProfile = + ::CORBA::TypeCode_ptr const _tc_TaggedProfile = &_tc_TAO_tc_IOP_TaggedProfile; } @@ -266,7 +266,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfileSeq ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_TaggedProfileSeq = + ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq = &_tc_TAO_tc_IOP_TaggedProfileSeq; } @@ -403,7 +403,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_IOR ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_IOR = + ::CORBA::TypeCode_ptr const _tc_IOR = &_tc_TAO_tc_IOP_IOR; } @@ -440,7 +440,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_ComponentId = + ::CORBA::TypeCode_ptr const _tc_ComponentId = &_tc_TAO_tc_IOP_ComponentId; } @@ -528,7 +528,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_TaggedComponent = + ::CORBA::TypeCode_ptr const _tc_TaggedComponent = &_tc_TAO_tc_IOP_TaggedComponent; } @@ -646,7 +646,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile = + ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile = &_tc_TAO_tc_IOP_MultipleComponentProfile; } @@ -760,7 +760,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_TaggedComponentList = + ::CORBA::TypeCode_ptr const _tc_TaggedComponentList = &_tc_TAO_tc_IOP_TaggedComponentList; } @@ -874,7 +874,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq = + ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq = &_tc_TAO_tc_IOP_TaggedComponentSeq; } @@ -911,7 +911,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_ServiceId = + ::CORBA::TypeCode_ptr const _tc_ServiceId = &_tc_TAO_tc_IOP_ServiceId; } @@ -1001,7 +1001,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_ServiceContext = + ::CORBA::TypeCode_ptr const _tc_ServiceContext = &_tc_TAO_tc_IOP_ServiceContext; } @@ -1117,7 +1117,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList ( namespace IOP { - ::CORBA::TypeCode_ptr _tc_ServiceContextList = + ::CORBA::TypeCode_ptr const _tc_ServiceContextList = &_tc_TAO_tc_IOP_ServiceContextList; } diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index addd00ead5b..5ed52f2560b 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -820,7 +820,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index 2429bf42c92..c3e424c82ef 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -86,7 +86,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProfileId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ProfileId; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -131,7 +131,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TaggedProfile; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -184,7 +184,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfileSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -219,7 +219,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IOR; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -230,7 +230,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ComponentId; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -265,7 +265,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TaggedComponent; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -318,7 +318,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -371,7 +371,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TaggedComponentList; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -424,7 +424,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -485,7 +485,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceId; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -520,7 +520,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceContext; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -573,7 +573,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContextList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceContextList; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp index 77596ff4c78..c6224cd84ac 100644 --- a/TAO/tao/LongDoubleSeqA.cpp +++ b/TAO/tao/LongDoubleSeqA.cpp @@ -71,7 +71,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_LongDoubleSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_LongDoubleSeq = + ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq = &_tc_TAO_tc_CORBA_LongDoubleSeq; } diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp index cf5205b67de..68181bda540 100644 --- a/TAO/tao/LongDoubleSeqC.cpp +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h index af02dd9db76..d06af543617 100644 --- a/TAO/tao/LongDoubleSeqC.h +++ b/TAO/tao/LongDoubleSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongDoubleSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp index 45498030c5f..d3e00457c13 100644 --- a/TAO/tao/LongLongSeqA.cpp +++ b/TAO/tao/LongLongSeqA.cpp @@ -70,7 +70,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_LongLongSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_LongLongSeq = + ::CORBA::TypeCode_ptr const _tc_LongLongSeq = &_tc_TAO_tc_CORBA_LongLongSeq; } diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp index 7f51e243c70..230744183d3 100644 --- a/TAO/tao/LongLongSeqC.cpp +++ b/TAO/tao/LongLongSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h index d7270bee161..ce0ae2a5405 100644 --- a/TAO/tao/LongLongSeqC.h +++ b/TAO/tao/LongLongSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongLongSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_LongLongSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp index 61b8f0ce399..fcb5bbc043a 100644 --- a/TAO/tao/LongSeqA.cpp +++ b/TAO/tao/LongSeqA.cpp @@ -68,7 +68,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_LongSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_LongSeq = + ::CORBA::TypeCode_ptr const _tc_LongSeq = &_tc_TAO_tc_CORBA_LongSeq; } diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp index 3607a2f8af4..46a096dad5e 100644 --- a/TAO/tao/LongSeqC.cpp +++ b/TAO/tao/LongSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h index 106b9fe567b..41c18e1970e 100644 --- a/TAO/tao/LongSeqC.h +++ b/TAO/tao/LongSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_LongSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp index 33787c24ac3..d56ff533736 100644 --- a/TAO/tao/Messaging_PolicyValueA.cpp +++ b/TAO/tao/Messaging_PolicyValueA.cpp @@ -115,7 +115,7 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue ( namespace Messaging { - ::CORBA::TypeCode_ptr _tc_PolicyValue = + ::CORBA::TypeCode_ptr const _tc_PolicyValue = &_tc_TAO_tc_Messaging_PolicyValue; } @@ -229,7 +229,7 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq ( namespace Messaging { - ::CORBA::TypeCode_ptr _tc_PolicyValueSeq = + ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq = &_tc_TAO_tc_Messaging_PolicyValueSeq; } diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 1e55ae831b4..4ce7192b741 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -212,7 +212,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index b7a943a6b5c..d0ff9ae1859 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -111,7 +111,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyValue; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -164,7 +164,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValueSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp index fc63464bb50..b72ec10418e 100644 --- a/TAO/tao/Messaging_SyncScopeC.cpp +++ b/TAO/tao/Messaging_SyncScopeC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp index 2a2e089cd0a..a7afd2a8bbe 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp @@ -73,7 +73,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate ( namespace TAO_Default_ORT { - ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate = + ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate = &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate; } diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp index fe474c0dbdd..ee8e4343fd0 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -244,7 +244,7 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h index 7ac89eda0a5..67e51b497e1 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.h +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h @@ -127,7 +127,7 @@ namespace TAO_Default_ORT static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:238 + // be\be_visitor_valuetype/valuetype_ch.cpp:246 protected: ObjectReferenceTemplate (void); @@ -154,7 +154,7 @@ namespace TAO_Default_ORT // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -209,7 +209,7 @@ namespace TAO #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_) #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_ORT_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate> { static void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *); diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp index 99f3d7449ed..bda01e9d169 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp @@ -39,27 +39,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] = { TAO_ENCAP_BYTE_ORDER, // byte order 59, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636546), - ACE_NTOHL (0x6163746f), - ACE_NTOHL (0x72793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x72793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0 23, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636546), - ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = ObjectReferenceFactory 2, // value modifier CORBA::tk_null, // no stateful base valuetype @@ -77,7 +77,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory = + ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory = &_tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory; } @@ -88,27 +88,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] = { TAO_ENCAP_BYTE_ORDER, // byte order 60, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0 24, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate 2, // value modifier CORBA::tk_null, // no stateful base valuetype @@ -126,7 +126,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate = + ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate = &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate; } @@ -137,29 +137,29 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 63, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x61746553), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746553), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0 27, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x61746553), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746553), ACE_NTOHL (0x65710000), // name = ObjectReferenceTemplateSeq CORBA::tk_sequence, // typecode kind 124, // encapsulation length @@ -168,33 +168,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] = 480, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 60, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0 24, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate 2, // value modifier CORBA::tk_null, // no stateful base valuetype 3, // member count - + 0U, }; @@ -209,7 +209,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq = + ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq = &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq; } diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index d2662989b53..fd6b9909f4c 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -48,19 +48,19 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:65 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO { // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:480 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_) #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_ - ACE_TEMPLATE_SPECIALIZATION + template<> class TAO_ORT_Export Arg_Traits<CORBA::StringSeq> : public Var_Size_Arg_Traits_T< @@ -494,7 +494,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index a9196b2c12b..7467bbd38d9 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -135,7 +135,7 @@ namespace PortableInterceptor static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:391 + // be\be_visitor_valuetype/valuetype_ch.cpp:404 public: virtual CORBA::Object_ptr make_object ( @@ -143,7 +143,7 @@ namespace PortableInterceptor ) = 0; // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:238 + // be\be_visitor_valuetype/valuetype_ch.cpp:246 protected: ObjectReferenceFactory (void); @@ -162,7 +162,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory; // TAO_IDL - Generated from // be\be_valuetype.cpp:525 @@ -214,7 +214,7 @@ namespace PortableInterceptor static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:391 + // be\be_visitor_valuetype/valuetype_ch.cpp:404 public: virtual char * server_id ( @@ -222,7 +222,7 @@ namespace PortableInterceptor ) = 0; // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:391 + // be\be_visitor_valuetype/valuetype_ch.cpp:404 public: virtual char * orb_id ( @@ -230,7 +230,7 @@ namespace PortableInterceptor ) = 0; // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:391 + // be\be_visitor_valuetype/valuetype_ch.cpp:404 public: virtual ::PortableInterceptor::AdapterName * adapter_name ( @@ -238,7 +238,7 @@ namespace PortableInterceptor ) = 0; // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:238 + // be\be_visitor_valuetype/valuetype_ch.cpp:246 protected: ObjectReferenceTemplate (void); @@ -257,7 +257,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -317,7 +317,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -341,7 +341,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory> { static void add_ref (PortableInterceptor::ObjectReferenceFactory *); @@ -354,7 +354,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate> { static void add_ref (PortableInterceptor::ObjectReferenceTemplate *); diff --git a/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff b/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff new file mode 100644 index 00000000000..f6a1bcdad03 --- /dev/null +++ b/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff @@ -0,0 +1,67 @@ +--- orig/ObjectReferenceTemplateC.h 2005-02-11 14:14:38.846872000 +0100 ++++ ObjectReferenceTemplateC.h 2005-02-11 14:17:20.779720000 +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: +@@ -33,6 +33,9 @@ + + #include /**/ "ace/pre.h" + ++#ifndef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE ++#error "You should not include ObjectReferenceTemplateC.h directly, use ObjectReferenceTemplate.h" ++#endif /* !TAO_OBJREF_TEMPLATE_SAFE_INCLUDE */ + + #include "ace/config-all.h" + +--- orig/ObjectReferenceTemplateC.cpp 2005-02-11 14:14:38.846872000 +0100 ++++ ObjectReferenceTemplateC.cpp 2005-02-11 14:17:20.749676800 +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 + + +-#include "ObjectReferenceTemplateC.h" ++#include "ObjectReferenceTemplate.h" + #include "tao/CDR.h" + #include "tao/Exception_Data.h" + #include "tao/Invocation_Adapter.h" +@@ -48,14 +48,14 @@ + #endif /* !defined INLINE */ + + // TAO_IDL - Generated from +-// be\be_visitor_arg_traits.cpp:66 ++// be\be_visitor_arg_traits.cpp:65 + + // Arg traits specializations. + namespace TAO + { + + // TAO_IDL - Generated from +- // be\be_visitor_arg_traits.cpp:433 ++ // be\be_visitor_arg_traits.cpp:383 + + #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_) + #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_ +--- orig/ObjectReferenceTemplateA.cpp 2005-02-11 14:14:38.866900800 +0100 ++++ ObjectReferenceTemplateA.cpp 2005-02-14 14:56:53.548045100 +0100 +@@ -25,7 +25,7 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#include "ObjectReferenceTemplateC.h" ++#include "ObjectReferenceTemplate.h" + #include "tao/Typecode.h" + #include "tao/CDR.h" + #include "tao/Any.h" diff --git a/TAO/tao/ObjectIdListA.cpp b/TAO/tao/ObjectIdListA.cpp index d46015c78a2..9f5fb8cc676 100644 --- a/TAO/tao/ObjectIdListA.cpp +++ b/TAO/tao/ObjectIdListA.cpp @@ -63,7 +63,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectId ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ORB_ObjectId = + ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId = &_tc_TAO_tc_CORBA_ORB_ObjectId; } @@ -128,7 +128,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ORB_ObjectIdList = + ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList = &_tc_TAO_tc_CORBA_ORB_ObjectIdList; } diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index 807a5fbad61..a032900138d 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h index 3a3cb5e7cb5..fec6fb6f810 100644 --- a/TAO/tao/ObjectIdListC.h +++ b/TAO/tao/ObjectIdListC.h @@ -84,7 +84,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -133,7 +133,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectIdList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 6d66acacab5..67aad5770a2 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -46,7 +46,7 @@ #include "ace/os_include/os_ctype.h" // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -337,7 +337,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp index 194118dbb4f..dba4e5cbd20 100644 --- a/TAO/tao/OctetSeqA.cpp +++ b/TAO/tao/OctetSeqA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_OctetSeq = + ::CORBA::TypeCode_ptr const _tc_OctetSeq = &_tc_TAO_tc_CORBA_OctetSeq; } diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index 066b432c2ae..adf80a37a7c 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -198,7 +198,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index ae8f301d14b..b6362922b2a 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -133,7 +133,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_OctetSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index db92895767d..308bd9931f7 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -43,7 +43,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -88,7 +88,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerId ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ServerId = + ::CORBA::TypeCode_ptr const _tc_ServerId = &_tc_TAO_tc_PortableInterceptor_ServerId; } @@ -127,7 +127,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBId ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ORBId = + ::CORBA::TypeCode_ptr const _tc_ORBId = &_tc_TAO_tc_PortableInterceptor_ORBId; } @@ -190,7 +190,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterName ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_AdapterName = + ::CORBA::TypeCode_ptr const _tc_AdapterName = &_tc_TAO_tc_PortableInterceptor_AdapterName; } @@ -253,7 +253,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectId ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ObjectId = + ::CORBA::TypeCode_ptr const _tc_ObjectId = &_tc_TAO_tc_PortableInterceptor_ObjectId; } @@ -298,7 +298,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_AdapterManagerId = + ::CORBA::TypeCode_ptr const _tc_AdapterManagerId = &_tc_TAO_tc_PortableInterceptor_AdapterManagerId; } @@ -341,12 +341,12 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_AdapterState = + ::CORBA::TypeCode_ptr const _tc_AdapterState = &_tc_TAO_tc_PortableInterceptor_AdapterState; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h index f408507b98e..b0ffb1cb573 100644 --- a/TAO/tao/PI_ForwardC.h +++ b/TAO/tao/PI_ForwardC.h @@ -84,7 +84,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerId; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:413 @@ -96,7 +96,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORBId; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -108,7 +108,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_AdapterName; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -120,7 +120,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectId; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -131,7 +131,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_AdapterManagerId; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -142,7 +142,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_AdapterState; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp index ab193558e85..0ee92294769 100644 --- a/TAO/tao/ParameterModeC.cpp +++ b/TAO/tao/ParameterModeC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp index 333293fa25b..b27e8b54db6 100644 --- a/TAO/tao/PolicyA.cpp +++ b/TAO/tao/PolicyA.cpp @@ -33,7 +33,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/typecode_defn.cpp:295 static const CORBA::Long _oc_CORBA_PolicyErrorCode[] = { @@ -73,7 +73,7 @@ namespace CORBA } // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/typecode_defn.cpp:295 static const CORBA::Long _oc_CORBA_Policy[] = { @@ -107,7 +107,7 @@ namespace CORBA } // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/typecode_defn.cpp:295 static const CORBA::Long _oc_CORBA_PolicyManager[] = { @@ -144,7 +144,7 @@ namespace CORBA } // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/typecode_defn.cpp:295 static const CORBA::Long _oc_CORBA_PolicyCurrent[] = { @@ -181,7 +181,7 @@ namespace CORBA } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean @@ -266,7 +266,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean @@ -351,7 +351,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean @@ -406,7 +406,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean @@ -475,7 +475,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 0bada5796b5..6fe942a5799 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:302 +// be\be_codegen.cpp:302 #include "PolicyC.h" @@ -48,7 +48,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:69 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -74,7 +74,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// be\be_visitor_exception/exception_cs.cpp:63 CORBA::PolicyError::PolicyError (void) : CORBA::UserException ( @@ -177,7 +177,7 @@ void CORBA::PolicyError::_tao_decode ( // TAO_IDL - Generated from -// be/be_visitor_exception/exception_ctor.cpp:66 +// be\be_visitor_exception/exception_ctor.cpp:66 CORBA::PolicyError::PolicyError ( CORBA::PolicyErrorCode _tao_reason @@ -197,7 +197,7 @@ CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const } // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/typecode_defn.cpp:295 static const CORBA::Long _oc_CORBA_PolicyError[] = { @@ -259,7 +259,7 @@ namespace CORBA } // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// be\be_visitor_exception/exception_cs.cpp:63 CORBA::InvalidPolicies::InvalidPolicies (void) : CORBA::UserException ( @@ -362,7 +362,7 @@ void CORBA::InvalidPolicies::_tao_decode ( // TAO_IDL - Generated from -// be/be_visitor_exception/exception_ctor.cpp:66 +// be\be_visitor_exception/exception_ctor.cpp:66 CORBA::InvalidPolicies::InvalidPolicies ( const CORBA::UShortSeq & _tao_indices @@ -382,7 +382,7 @@ CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const } // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/typecode_defn.cpp:295 static const CORBA::Long _oc_CORBA_InvalidPolicies[] = { @@ -448,7 +448,7 @@ namespace CORBA } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for CORBA::Policy. @@ -490,7 +490,7 @@ TAO::Collocation_Proxy_Broker * ) = 0; // TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 +// be\be_visitor_operation/operation_cs.cpp:78 CORBA::PolicyType CORBA::Policy::policy_type ( ACE_ENV_SINGLE_ARG_DECL @@ -532,7 +532,7 @@ CORBA::PolicyType CORBA::Policy::policy_type ( } // TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 +// be\be_visitor_operation/operation_cs.cpp:78 ::CORBA::Policy_ptr CORBA::Policy::copy ( ACE_ENV_SINGLE_ARG_DECL @@ -574,7 +574,7 @@ CORBA::PolicyType CORBA::Policy::policy_type ( } // TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 +// be\be_visitor_operation/operation_cs.cpp:78 void CORBA::Policy::destroy ( ACE_ENV_SINGLE_ARG_DECL @@ -727,7 +727,7 @@ CORBA::Policy::marshal (TAO_OutputCDR &cdr) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for CORBA::PolicyManager. @@ -868,7 +868,7 @@ CORBA::PolicyManager::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for CORBA::PolicyCurrent. @@ -1017,7 +1017,7 @@ CORBA::PolicyCurrent::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_exception/cdr_op_cs.cpp:60 +// be\be_visitor_exception/cdr_op_cs.cpp:60 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -1050,7 +1050,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be/be_visitor_exception/cdr_op_cs.cpp:60 +// be\be_visitor_exception/cdr_op_cs.cpp:60 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -1111,7 +1111,7 @@ CORBA::Policy::_tao_scope (void) const // **************************************************************** // TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 +// be\be_visitor_interface/cdr_op_cs.cpp:63 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -1147,7 +1147,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 28d3f9118d6..130d78f46d6 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:153 +// be\be_codegen.cpp:153 #ifndef _TAO_IDL_ORIG_POLICYC_H_ #define _TAO_IDL_ORIG_POLICYC_H_ @@ -73,7 +73,7 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be/be_visitor_root/root_ch.cpp:62 +// be\be_visitor_root/root_ch.cpp:62 namespace TAO { @@ -84,49 +84,49 @@ namespace TAO } // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:48 namespace CORBA { // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:379 + // be\be_visitor_typedef/typedef_ch.cpp:379 typedef CORBA::Short PolicyErrorCode; typedef CORBA::Short_out PolicyErrorCode_out; // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyErrorCode BAD_POLICY = 0; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4; // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 + // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_POLICYERROR_CH_) #define _CORBA_POLICYERROR_CH_ @@ -164,27 +164,27 @@ namespace CORBA ); // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ctor.cpp:66 + // be\be_visitor_exception/exception_ctor.cpp:66 PolicyError ( ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason ); // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:127 + // be\be_visitor_exception/exception_ch.cpp:127 virtual CORBA::TypeCode_ptr _type (void) const; }; // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyError; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 + // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_INVALIDPOLICIES_CH_) #define _CORBA_INVALIDPOLICIES_CH_ @@ -222,27 +222,27 @@ namespace CORBA ); // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ctor.cpp:66 + // be\be_visitor_exception/exception_ctor.cpp:66 InvalidPolicies ( const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices ); // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:127 + // be\be_visitor_exception/exception_ch.cpp:127 virtual CORBA::TypeCode_ptr _type (void) const; }; // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_InvalidPolicies; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_CORBA_POLICY__VAR_OUT_CH_) #define _CORBA_POLICY__VAR_OUT_CH_ @@ -265,7 +265,7 @@ namespace CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICY_CH_) #define _CORBA_POLICY_CH_ @@ -301,7 +301,7 @@ namespace CORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::PolicyType policy_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -311,7 +311,7 @@ namespace CORBA )); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -321,7 +321,7 @@ namespace CORBA )); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -331,7 +331,7 @@ namespace CORBA )); // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -386,12 +386,12 @@ namespace CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Policy; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_) #define _CORBA_POLICYMANAGER__VAR_OUT_CH_ @@ -414,7 +414,7 @@ namespace CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICYMANAGER_CH_) #define _CORBA_POLICYMANAGER_CH_ @@ -449,7 +449,7 @@ namespace CORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::PolicyList * get_policy_overrides ( const ::CORBA::PolicyTypeSeq & ts @@ -460,7 +460,7 @@ namespace CORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void set_policy_overrides ( const ::CORBA::PolicyList & policies, @@ -473,7 +473,7 @@ namespace CORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -499,12 +499,12 @@ namespace CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyManager; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_) #define _CORBA_POLICYCURRENT__VAR_OUT_CH_ @@ -527,7 +527,7 @@ namespace CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICYCURRENT_CH_) #define _CORBA_POLICYCURRENT_CH_ @@ -563,7 +563,7 @@ namespace CORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -589,19 +589,19 @@ namespace CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyCurrent; // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module CORBA // Proxy Broker Factory function pointer declarations. // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:230 +// be\be_visitor_root/root.cpp:230 extern TAO_Export TAO::Collocation_Proxy_Broker * @@ -610,7 +610,7 @@ TAO::Collocation_Proxy_Broker * ); // TAO_IDL - Generated from -// be/be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -681,7 +681,7 @@ namespace TAO } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_ch.cpp:52 +// be\be_visitor_exception/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyError &); // copying version TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyError*); // noncopying version @@ -689,7 +689,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyError *& TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyError *&); // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_ch.cpp:52 +// be\be_visitor_exception/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::InvalidPolicies &); // copying version TAO_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopying version @@ -697,46 +697,46 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InvalidPolicie TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidPolicies *&); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr); // copying TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyManager_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr); // copying TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyCurrent_ptr &); // TAO_IDL - Generated from -// be/be_visitor_exception/cdr_op_ch.cpp:52 +// be\be_visitor_exception/cdr_op_ch.cpp:52 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyError &); // TAO_IDL - Generated from -// be/be_visitor_exception/cdr_op_ch.cpp:52 +// be\be_visitor_exception/cdr_op_ch.cpp:52 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &); // TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 +// be\be_visitor_interface/cdr_op_ch.cpp:55 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); // TAO_IDL - Generated from -// be/be_codegen.cpp:961 +// be\be_codegen.cpp:961 #if defined (__ACE_INLINE__) #include "PolicyC.inl" diff --git a/TAO/tao/PolicyC.inl b/TAO/tao/PolicyC.inl index d250cfb9634..2bc9b36e2dc 100644 --- a/TAO/tao/PolicyC.inl +++ b/TAO/tao/PolicyC.inl @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 +// be\be_visitor_interface/interface_ci.cpp:70 #if !defined (_CORBA_POLICY___CI_) #define _CORBA_POLICY___CI_ diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp index 5c38aac4bd5..697a63c946c 100644 --- a/TAO/tao/Policy_ForwardA.cpp +++ b/TAO/tao/Policy_ForwardA.cpp @@ -66,7 +66,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_PolicyType = + ::CORBA::TypeCode_ptr const _tc_PolicyType = &_tc_TAO_tc_CORBA_PolicyType; } @@ -123,7 +123,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_PolicyList = + ::CORBA::TypeCode_ptr const _tc_PolicyList = &_tc_TAO_tc_CORBA_PolicyList; } @@ -185,7 +185,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq = + ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq = &_tc_TAO_tc_CORBA_PolicyTypeSeq; } @@ -234,7 +234,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_SetOverrideType = + ::CORBA::TypeCode_ptr const _tc_SetOverrideType = &_tc_TAO_tc_CORBA_SetOverrideType; } diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 2a6f352a225..2736b9c540f 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -314,7 +314,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index 673f0532597..b8c12fe5b27 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -83,7 +83,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyType; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -166,7 +166,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyList; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -219,7 +219,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -258,7 +258,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SetOverrideType; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 23711693de1..89d562af40d 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -55,7 +55,6 @@ namespace TAO // Traits specializations for CORBA::Pollable. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Pollable_ptr TAO::Objref_Traits<CORBA::Pollable>::duplicate ( CORBA::Pollable_ptr p @@ -64,7 +63,6 @@ TAO::Objref_Traits<CORBA::Pollable>::duplicate ( return CORBA::Pollable::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<CORBA::Pollable>::release ( CORBA::Pollable_ptr p @@ -73,14 +71,12 @@ TAO::Objref_Traits<CORBA::Pollable>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Pollable_ptr TAO::Objref_Traits<CORBA::Pollable>::nil (void) { return CORBA::Pollable::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<CORBA::Pollable>::marshal ( CORBA::Pollable_ptr p, @@ -141,6 +137,12 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj) return obj; } +void +CORBA::Pollable::_tao_release (Pollable_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean CORBA::Pollable::_is_a ( const char *value @@ -186,7 +188,6 @@ CORBA::Pollable::marshal (TAO_OutputCDR &) // Traits specializations for CORBA::DIIPollable. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DIIPollable_ptr TAO::Objref_Traits<CORBA::DIIPollable>::duplicate ( CORBA::DIIPollable_ptr p @@ -195,7 +196,6 @@ TAO::Objref_Traits<CORBA::DIIPollable>::duplicate ( return CORBA::DIIPollable::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<CORBA::DIIPollable>::release ( CORBA::DIIPollable_ptr p @@ -204,14 +204,12 @@ TAO::Objref_Traits<CORBA::DIIPollable>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DIIPollable_ptr TAO::Objref_Traits<CORBA::DIIPollable>::nil (void) { return CORBA::DIIPollable::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<CORBA::DIIPollable>::marshal ( CORBA::DIIPollable_ptr p, @@ -272,6 +270,12 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj) return obj; } +void +CORBA::DIIPollable::_tao_release (DIIPollable_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean CORBA::DIIPollable::_is_a ( const char *value @@ -321,7 +325,6 @@ CORBA::DIIPollable::marshal (TAO_OutputCDR &) // Traits specializations for CORBA::PollableSet. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PollableSet_ptr TAO::Objref_Traits<CORBA::PollableSet>::duplicate ( CORBA::PollableSet_ptr p @@ -330,7 +333,6 @@ TAO::Objref_Traits<CORBA::PollableSet>::duplicate ( return CORBA::PollableSet::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<CORBA::PollableSet>::release ( CORBA::PollableSet_ptr p @@ -339,14 +341,12 @@ TAO::Objref_Traits<CORBA::PollableSet>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PollableSet_ptr TAO::Objref_Traits<CORBA::PollableSet>::nil (void) { return CORBA::PollableSet::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<CORBA::PollableSet>::marshal ( CORBA::PollableSet_ptr p, @@ -575,6 +575,12 @@ CORBA::PollableSet::_duplicate (PollableSet_ptr obj) return obj; } +void +CORBA::PollableSet::_tao_release (PollableSet_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean CORBA::PollableSet::_is_a ( const char *value @@ -616,7 +622,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index 21b1fb5323a..a2af394b47a 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -147,6 +147,8 @@ namespace CORBA // The static operations. static Pollable_ptr _duplicate (Pollable_ptr obj); + static void _tao_release (Pollable_ptr obj); + static Pollable_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -186,7 +188,7 @@ namespace CORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -250,6 +252,8 @@ namespace CORBA // The static operations. static DIIPollable_ptr _duplicate (DIIPollable_ptr obj); + static void _tao_release (DIIPollable_ptr obj); + static DIIPollable_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -268,7 +272,7 @@ namespace CORBA // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -309,6 +313,8 @@ namespace CORBA // The static operations. static PollableSet_ptr _duplicate (PollableSet_ptr obj); + static void _tao_release (PollableSet_ptr obj); + static PollableSet_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -464,7 +470,7 @@ namespace CORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -504,7 +510,7 @@ namespace TAO #if !defined (_CORBA_POLLABLESET__TRAITS_CH_) #define _CORBA_POLLABLESET__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::CORBA::PollableSet> { static ::CORBA::PollableSet_ptr duplicate ( @@ -525,7 +531,7 @@ namespace TAO #if !defined (_CORBA_POLLABLE__TRAITS_CH_) #define _CORBA_POLLABLE__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::CORBA::Pollable> { static ::CORBA::Pollable_ptr duplicate ( @@ -546,7 +552,7 @@ namespace TAO #if !defined (_CORBA_DIIPOLLABLE__TRAITS_CH_) #define _CORBA_DIIPOLLABLE__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::CORBA::DIIPollable> { static ::CORBA::DIIPollable_ptr duplicate ( diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp index c315bd4db4c..aef097b508f 100644 --- a/TAO/tao/PortableInterceptorA.cpp +++ b/TAO/tao/PortableInterceptorA.cpp @@ -67,7 +67,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Interceptor ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_Interceptor = + ::CORBA::TypeCode_ptr const _tc_Interceptor = &_tc_TAO_tc_PortableInterceptor_Interceptor; } @@ -108,7 +108,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ReplyStatus = + ::CORBA::TypeCode_ptr const _tc_ReplyStatus = &_tc_TAO_tc_PortableInterceptor_ReplyStatus; } @@ -147,7 +147,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_SlotId = + ::CORBA::TypeCode_ptr const _tc_SlotId = &_tc_TAO_tc_PortableInterceptor_SlotId; } @@ -184,7 +184,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_Current = + ::CORBA::TypeCode_ptr const _tc_Current = &_tc_TAO_tc_PortableInterceptor_Current; } @@ -223,7 +223,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RequestInfo ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_RequestInfo = + ::CORBA::TypeCode_ptr const _tc_RequestInfo = &_tc_TAO_tc_PortableInterceptor_RequestInfo; } @@ -266,7 +266,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInfo ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ClientRequestInfo = + ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo = &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo; } @@ -309,7 +309,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInfo ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ServerRequestInfo = + ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo = &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo; } @@ -356,7 +356,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor = + ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor = &_tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor; } @@ -403,7 +403,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor = + ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor = &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor; } @@ -444,7 +444,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_PolicyFactory ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_PolicyFactory = + ::CORBA::TypeCode_ptr const _tc_PolicyFactory = &_tc_TAO_tc_PortableInterceptor_PolicyFactory; } @@ -486,7 +486,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId ( 0 ); -::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_ObjectId = +::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId = &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId; // TAO_IDL - Generated from @@ -524,7 +524,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ORBInitInfo = + ::CORBA::TypeCode_ptr const _tc_ORBInitInfo = &_tc_TAO_tc_PortableInterceptor_ORBInitInfo; } @@ -565,7 +565,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitializer ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ORBInitializer = + ::CORBA::TypeCode_ptr const _tc_ORBInitializer = &_tc_TAO_tc_PortableInterceptor_ORBInitializer; } diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 2c9ef07a3e5..ad29af1c2ca 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -44,7 +44,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -57,7 +57,6 @@ namespace TAO // Traits specializations for PortableInterceptor::Interceptor. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Interceptor_ptr TAO::Objref_Traits<PortableInterceptor::Interceptor>::duplicate ( PortableInterceptor::Interceptor_ptr p @@ -66,7 +65,6 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::duplicate ( return PortableInterceptor::Interceptor::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::Interceptor>::release ( PortableInterceptor::Interceptor_ptr p @@ -75,14 +73,12 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Interceptor_ptr TAO::Objref_Traits<PortableInterceptor::Interceptor>::nil (void) { return PortableInterceptor::Interceptor::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::Interceptor>::marshal ( PortableInterceptor::Interceptor_ptr p, @@ -151,6 +147,12 @@ PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj) return obj; } +void +PortableInterceptor::Interceptor::_tao_release (Interceptor_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::Interceptor::_is_a ( const char *value @@ -381,7 +383,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_ForwardRequest = + ::CORBA::TypeCode_ptr const _tc_ForwardRequest = &_tc_TAO_tc_PortableInterceptor_ForwardRequest; } @@ -526,7 +528,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot ( namespace PortableInterceptor { - ::CORBA::TypeCode_ptr _tc_InvalidSlot = + ::CORBA::TypeCode_ptr const _tc_InvalidSlot = &_tc_TAO_tc_PortableInterceptor_InvalidSlot; } @@ -535,7 +537,6 @@ namespace PortableInterceptor // Traits specializations for PortableInterceptor::Current. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Current_ptr TAO::Objref_Traits<PortableInterceptor::Current>::duplicate ( PortableInterceptor::Current_ptr p @@ -544,7 +545,6 @@ TAO::Objref_Traits<PortableInterceptor::Current>::duplicate ( return PortableInterceptor::Current::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::Current>::release ( PortableInterceptor::Current_ptr p @@ -553,14 +553,12 @@ TAO::Objref_Traits<PortableInterceptor::Current>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Current_ptr TAO::Objref_Traits<PortableInterceptor::Current>::nil (void) { return PortableInterceptor::Current::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::Current>::marshal ( PortableInterceptor::Current_ptr p, @@ -629,6 +627,12 @@ PortableInterceptor::Current::_duplicate (Current_ptr obj) return obj; } +void +PortableInterceptor::Current::_tao_release (Current_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::Current::_is_a ( const char *value @@ -678,7 +682,6 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &) // Traits specializations for PortableInterceptor::RequestInfo. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::RequestInfo_ptr TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate ( PortableInterceptor::RequestInfo_ptr p @@ -687,7 +690,6 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate ( return PortableInterceptor::RequestInfo::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release ( PortableInterceptor::RequestInfo_ptr p @@ -696,14 +698,12 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::RequestInfo_ptr TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void) { return PortableInterceptor::RequestInfo::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal ( PortableInterceptor::RequestInfo_ptr p, @@ -772,6 +772,12 @@ PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj) return obj; } +void +PortableInterceptor::RequestInfo::_tao_release (RequestInfo_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::RequestInfo::_is_a ( const char *value @@ -817,7 +823,6 @@ PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) // Traits specializations for PortableInterceptor::ClientRequestInfo. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInfo_ptr TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate ( PortableInterceptor::ClientRequestInfo_ptr p @@ -826,7 +831,6 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate ( return PortableInterceptor::ClientRequestInfo::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release ( PortableInterceptor::ClientRequestInfo_ptr p @@ -835,14 +839,12 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInfo_ptr TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void) { return PortableInterceptor::ClientRequestInfo::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal ( PortableInterceptor::ClientRequestInfo_ptr p, @@ -911,6 +913,12 @@ PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj) return obj; } +void +PortableInterceptor::ClientRequestInfo::_tao_release (ClientRequestInfo_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::ClientRequestInfo::_is_a ( const char *value @@ -960,7 +968,6 @@ PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) // Traits specializations for PortableInterceptor::ServerRequestInfo. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInfo_ptr TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate ( PortableInterceptor::ServerRequestInfo_ptr p @@ -969,7 +976,6 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate ( return PortableInterceptor::ServerRequestInfo::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release ( PortableInterceptor::ServerRequestInfo_ptr p @@ -978,14 +984,12 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInfo_ptr TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void) { return PortableInterceptor::ServerRequestInfo::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal ( PortableInterceptor::ServerRequestInfo_ptr p, @@ -1054,6 +1058,12 @@ PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj) return obj; } +void +PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::ServerRequestInfo::_is_a ( const char *value @@ -1103,7 +1113,6 @@ PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) // Traits specializations for PortableInterceptor::ClientRequestInterceptor. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInterceptor_ptr TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::duplicate ( PortableInterceptor::ClientRequestInterceptor_ptr p @@ -1112,7 +1121,6 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::duplicate ( return PortableInterceptor::ClientRequestInterceptor::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release ( PortableInterceptor::ClientRequestInterceptor_ptr p @@ -1121,14 +1129,12 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInterceptor_ptr TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::nil (void) { return PortableInterceptor::ClientRequestInterceptor::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::marshal ( PortableInterceptor::ClientRequestInterceptor_ptr p, @@ -1197,6 +1203,12 @@ PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestIntercep return obj; } +void +PortableInterceptor::ClientRequestInterceptor::_tao_release (ClientRequestInterceptor_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::ClientRequestInterceptor::_is_a ( const char *value @@ -1246,7 +1258,6 @@ PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) // Traits specializations for PortableInterceptor::ServerRequestInterceptor. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInterceptor_ptr TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::duplicate ( PortableInterceptor::ServerRequestInterceptor_ptr p @@ -1255,7 +1266,6 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::duplicate ( return PortableInterceptor::ServerRequestInterceptor::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release ( PortableInterceptor::ServerRequestInterceptor_ptr p @@ -1264,14 +1274,12 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInterceptor_ptr TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void) { return PortableInterceptor::ServerRequestInterceptor::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal ( PortableInterceptor::ServerRequestInterceptor_ptr p, @@ -1340,6 +1348,12 @@ PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestIntercep return obj; } +void +PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterceptor_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::ServerRequestInterceptor::_is_a ( const char *value @@ -1389,7 +1403,6 @@ PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &) // Traits specializations for PortableInterceptor::PolicyFactory. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::PolicyFactory_ptr TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate ( PortableInterceptor::PolicyFactory_ptr p @@ -1398,7 +1411,6 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate ( return PortableInterceptor::PolicyFactory::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release ( PortableInterceptor::PolicyFactory_ptr p @@ -1407,14 +1419,12 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::PolicyFactory_ptr TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void) { return PortableInterceptor::PolicyFactory::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal ( PortableInterceptor::PolicyFactory_ptr p, @@ -1483,6 +1493,12 @@ PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj) return obj; } +void +PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::PolicyFactory::_is_a ( const char *value @@ -1528,7 +1544,6 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) // Traits specializations for PortableInterceptor::ORBInitInfo. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitInfo_ptr TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate ( PortableInterceptor::ORBInitInfo_ptr p @@ -1537,7 +1552,6 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate ( return PortableInterceptor::ORBInitInfo::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release ( PortableInterceptor::ORBInitInfo_ptr p @@ -1546,14 +1560,12 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitInfo_ptr TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void) { return PortableInterceptor::ORBInitInfo::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal ( PortableInterceptor::ORBInitInfo_ptr p, @@ -1720,7 +1732,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName 0 ); -::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_DuplicateName = +::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName = &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName; // TAO_IDL - Generated from @@ -1855,7 +1867,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName ( 0 ); -::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_InvalidName = +::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName = &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName; PortableInterceptor::ORBInitInfo::ORBInitInfo (void) @@ -1917,6 +1929,12 @@ PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj) return obj; } +void +PortableInterceptor::ORBInitInfo::_tao_release (ORBInitInfo_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::ORBInitInfo::_is_a ( const char *value @@ -1974,7 +1992,6 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType // Traits specializations for PortableInterceptor::ORBInitializer. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitializer_ptr TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate ( PortableInterceptor::ORBInitializer_ptr p @@ -1983,7 +2000,6 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate ( return PortableInterceptor::ORBInitializer::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release ( PortableInterceptor::ORBInitializer_ptr p @@ -1992,14 +2008,12 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitializer_ptr TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void) { return PortableInterceptor::ORBInitializer::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal ( PortableInterceptor::ORBInitializer_ptr p, @@ -2068,6 +2082,12 @@ PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj) return obj; } +void +PortableInterceptor::ORBInitializer::_tao_release (ORBInitializer_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableInterceptor::ORBInitializer::_is_a ( const char *value @@ -2164,7 +2184,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index 424c56edd69..ee68bb2e549 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -174,6 +174,8 @@ namespace PortableInterceptor // The static operations. static Interceptor_ptr _duplicate (Interceptor_ptr obj); + static void _tao_release (Interceptor_ptr obj); + static Interceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -212,7 +214,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -240,7 +242,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Interceptor; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Interceptor; // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 @@ -298,7 +300,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ForwardRequest; #endif /* end #if !defined */ @@ -311,7 +313,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStatus; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ReplyStatus; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -357,7 +359,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SlotId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SlotId; // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 @@ -405,7 +407,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_InvalidSlot; #endif /* end #if !defined */ @@ -448,6 +450,8 @@ namespace PortableInterceptor // The static operations. static Current_ptr _duplicate (Current_ptr obj); + static void _tao_release (Current_ptr obj); + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -491,7 +495,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -519,7 +523,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -560,6 +564,8 @@ namespace PortableInterceptor // The static operations. static RequestInfo_ptr _duplicate (RequestInfo_ptr obj); + static void _tao_release (RequestInfo_ptr obj); + static RequestInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -722,7 +728,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -750,7 +756,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestInfo; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -791,6 +797,8 @@ namespace PortableInterceptor // The static operations. static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj); + static void _tao_release (ClientRequestInfo_ptr obj); + static ClientRequestInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -904,7 +912,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -932,7 +940,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -973,6 +981,8 @@ namespace PortableInterceptor // The static operations. static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj); + static void _tao_release (ServerRequestInfo_ptr obj); + static ServerRequestInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1108,7 +1118,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1136,7 +1146,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1177,6 +1187,8 @@ namespace PortableInterceptor // The static operations. static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj); + static void _tao_release (ClientRequestInterceptor_ptr obj); + static ClientRequestInterceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1253,7 +1265,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1281,7 +1293,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1322,6 +1334,8 @@ namespace PortableInterceptor // The static operations. static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj); + static void _tao_release (ServerRequestInterceptor_ptr obj); + static ServerRequestInterceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1414,7 +1428,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1442,7 +1456,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1483,6 +1497,8 @@ namespace PortableInterceptor // The static operations. static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj); + static void _tao_release (PolicyFactory_ptr obj); + static PolicyFactory_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1524,7 +1540,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1552,7 +1568,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyFactory; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1616,6 +1632,8 @@ namespace PortableInterceptor // The static operations. static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj); + static void _tao_release (ORBInitInfo_ptr obj); + static ORBInitInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1643,7 +1661,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_ObjectId; + static ::CORBA::TypeCode_ptr const _tc_ObjectId; // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 @@ -1699,7 +1717,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_DuplicateName; + static ::CORBA::TypeCode_ptr const _tc_DuplicateName; #endif /* end #if !defined */ @@ -1749,7 +1767,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_InvalidName; + static ::CORBA::TypeCode_ptr const _tc_InvalidName; #endif /* end #if !defined */ @@ -1867,7 +1885,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1895,7 +1913,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitInfo; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORBInitInfo; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1936,6 +1954,8 @@ namespace PortableInterceptor // The static operations. static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj); + static void _tao_release (ORBInitializer_ptr obj); + static ORBInitializer_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1976,7 +1996,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2004,7 +2024,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitializer; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORBInitializer; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -2021,7 +2041,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::Interceptor> { static ::PortableInterceptor::Interceptor_ptr duplicate ( @@ -2042,7 +2062,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::Current> { static ::PortableInterceptor::Current_ptr duplicate ( @@ -2063,7 +2083,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::RequestInfo> { static ::PortableInterceptor::RequestInfo_ptr duplicate ( @@ -2084,7 +2104,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo> { static ::PortableInterceptor::ClientRequestInfo_ptr duplicate ( @@ -2105,7 +2125,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo> { static ::PortableInterceptor::ServerRequestInfo_ptr duplicate ( @@ -2126,7 +2146,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor> { static ::PortableInterceptor::ClientRequestInterceptor_ptr duplicate ( @@ -2147,7 +2167,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor> { static ::PortableInterceptor::ServerRequestInterceptor_ptr duplicate ( @@ -2168,7 +2188,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::PolicyFactory> { static ::PortableInterceptor::PolicyFactory_ptr duplicate ( @@ -2189,7 +2209,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo> { static ::PortableInterceptor::ORBInitInfo_ptr duplicate ( @@ -2210,7 +2230,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitializer> { static ::PortableInterceptor::ORBInitializer_ptr duplicate ( diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp index 065c3af75b0..02de5e46125 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp @@ -70,7 +70,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_AdapterActivator = + ::CORBA::TypeCode_ptr const _tc_AdapterActivator = &_tc_TAO_tc_PortableServer_AdapterActivator; } diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp index 0a325fd9dd7..66c8422229d 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 #if (TAO_HAS_MINIMUM_POA == 0) @@ -57,7 +57,6 @@ namespace TAO // Traits specializations for PortableServer::AdapterActivator. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::AdapterActivator_ptr TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate ( PortableServer::AdapterActivator_ptr p @@ -66,7 +65,6 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate ( return PortableServer::AdapterActivator::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::AdapterActivator>::release ( PortableServer::AdapterActivator_ptr p @@ -75,14 +73,12 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::AdapterActivator_ptr TAO::Objref_Traits<PortableServer::AdapterActivator>::nil (void) { return PortableServer::AdapterActivator::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::AdapterActivator>::marshal ( PortableServer::AdapterActivator_ptr p, @@ -151,6 +147,12 @@ PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj) return obj; } +void +PortableServer::AdapterActivator::_tao_release (AdapterActivator_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::AdapterActivator::_is_a ( const char *value @@ -192,7 +194,7 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h index a48d87045ac..3b666219959 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.h +++ b/TAO/tao/PortableServer/AdapterActivatorC.h @@ -128,6 +128,8 @@ namespace PortableServer // The static operations. static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj); + static void _tao_release (AdapterActivator_ptr obj); + static AdapterActivator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -158,7 +160,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -186,7 +188,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterActivator; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_AdapterActivator; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -203,7 +205,7 @@ namespace TAO #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator> { static ::PortableServer::AdapterActivator_ptr duplicate ( diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp index 2e4ad351639..fb9e4cfbc96 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.cpp +++ b/TAO/tao/PortableServer/ForwardRequestC.cpp @@ -46,7 +46,7 @@ #if (TAO_HAS_MINIMUM_POA == 0) // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -236,7 +236,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ForwardRequest = + ::CORBA::TypeCode_ptr const _tc_ForwardRequest = &_tc_TAO_tc_PortableServer_ForwardRequest; } @@ -274,7 +274,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h index 7b1ff32e2bb..7d24f188b8a 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.h +++ b/TAO/tao/PortableServer/ForwardRequestC.h @@ -128,7 +128,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ForwardRequest; #endif /* end #if !defined */ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp index b877b66c62a..f07cff9d82e 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp @@ -80,7 +80,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue = + ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicyValue = &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue; } @@ -122,7 +122,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy = + ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicy = &_tc_TAO_tc_PortableServer_IdAssignmentPolicy; } diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp index c4ff80cb39d..990a5b574b5 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -55,7 +55,6 @@ namespace TAO // Traits specializations for PortableServer::IdAssignmentPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdAssignmentPolicy_ptr TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate ( PortableServer::IdAssignmentPolicy_ptr p @@ -64,7 +63,6 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate ( return PortableServer::IdAssignmentPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release ( PortableServer::IdAssignmentPolicy_ptr p @@ -73,14 +71,12 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdAssignmentPolicy_ptr TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::nil (void) { return PortableServer::IdAssignmentPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::marshal ( PortableServer::IdAssignmentPolicy_ptr p, @@ -149,6 +145,12 @@ PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj) return obj; } +void +PortableServer::IdAssignmentPolicy::_tao_release (IdAssignmentPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a ( const char *value @@ -216,7 +218,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolic } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h index f62572af4f8..0a096594923 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h @@ -101,7 +101,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicyValue; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -142,6 +142,8 @@ namespace PortableServer // The static operations. static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj); + static void _tao_release (IdAssignmentPolicy_ptr obj); + static IdAssignmentPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -190,7 +192,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -218,7 +220,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -235,7 +237,7 @@ namespace TAO #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdAssignmentPolicy> { static ::PortableServer::IdAssignmentPolicy_ptr duplicate ( diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp index e47c2ab58a2..ee391803b79 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp @@ -81,7 +81,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue = + ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicyValue = &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue; } @@ -123,7 +123,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy = + ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicy = &_tc_TAO_tc_PortableServer_IdUniquenessPolicy; } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp index 6229c1f6250..6d22acd446b 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -55,7 +55,6 @@ namespace TAO // Traits specializations for PortableServer::IdUniquenessPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdUniquenessPolicy_ptr TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate ( PortableServer::IdUniquenessPolicy_ptr p @@ -64,7 +63,6 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate ( return PortableServer::IdUniquenessPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release ( PortableServer::IdUniquenessPolicy_ptr p @@ -73,14 +71,12 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdUniquenessPolicy_ptr TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::nil (void) { return PortableServer::IdUniquenessPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::marshal ( PortableServer::IdUniquenessPolicy_ptr p, @@ -149,6 +145,12 @@ PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj) return obj; } +void +PortableServer::IdUniquenessPolicy::_tao_release (IdUniquenessPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a ( const char *value @@ -216,7 +218,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolic } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h index e042e8cf04a..c2c07191c90 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h @@ -101,7 +101,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicyValue; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -142,6 +142,8 @@ namespace PortableServer // The static operations. static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj); + static void _tao_release (IdUniquenessPolicy_ptr obj); + static IdUniquenessPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -190,7 +192,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -218,7 +220,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -235,7 +237,7 @@ namespace TAO #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdUniquenessPolicy> { static ::PortableServer::IdUniquenessPolicy_ptr duplicate ( diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp index d50da6cb975..00341664735 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp @@ -92,7 +92,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue = + ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue = &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue; } @@ -137,7 +137,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy = + ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy = &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy; } diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp index a7aec1b47bb..c58998d1d05 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 #if (TAO_HAS_MINIMUM_POA == 0) @@ -57,7 +57,6 @@ namespace TAO // Traits specializations for PortableServer::ImplicitActivationPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ImplicitActivationPolicy_ptr TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate ( PortableServer::ImplicitActivationPolicy_ptr p @@ -66,7 +65,6 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate ( return PortableServer::ImplicitActivationPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release ( PortableServer::ImplicitActivationPolicy_ptr p @@ -75,14 +73,12 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ImplicitActivationPolicy_ptr TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::nil (void) { return PortableServer::ImplicitActivationPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::marshal ( PortableServer::ImplicitActivationPolicy_ptr p, @@ -151,6 +147,12 @@ PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_p return obj; } +void +PortableServer::ImplicitActivationPolicy::_tao_release (ImplicitActivationPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a ( const char *value @@ -218,7 +220,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivatio } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h index 1cccccf5c99..e825a1d5f72 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h @@ -102,7 +102,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -143,6 +143,8 @@ namespace PortableServer // The static operations. static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj); + static void _tao_release (ImplicitActivationPolicy_ptr obj); + static ImplicitActivationPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -191,7 +193,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -219,7 +221,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -238,7 +240,7 @@ namespace TAO #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ImplicitActivationPolicy> { static ::PortableServer::ImplicitActivationPolicy_ptr duplicate ( diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp index ae74dcc5f0f..2e29aaede28 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp @@ -79,7 +79,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue = + ::CORBA::TypeCode_ptr const _tc_LifespanPolicyValue = &_tc_TAO_tc_PortableServer_LifespanPolicyValue; } @@ -119,7 +119,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_LifespanPolicy = + ::CORBA::TypeCode_ptr const _tc_LifespanPolicy = &_tc_TAO_tc_PortableServer_LifespanPolicy; } diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp index dd6e1882355..43c90cc0dd1 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -55,7 +55,6 @@ namespace TAO // Traits specializations for PortableServer::LifespanPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::LifespanPolicy_ptr TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate ( PortableServer::LifespanPolicy_ptr p @@ -64,7 +63,6 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate ( return PortableServer::LifespanPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::LifespanPolicy>::release ( PortableServer::LifespanPolicy_ptr p @@ -73,14 +71,12 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::LifespanPolicy_ptr TAO::Objref_Traits<PortableServer::LifespanPolicy>::nil (void) { return PortableServer::LifespanPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::LifespanPolicy>::marshal ( PortableServer::LifespanPolicy_ptr p, @@ -149,6 +145,12 @@ PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj) return obj; } +void +PortableServer::LifespanPolicy::_tao_release (LifespanPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::LifespanPolicy::_is_a ( const char *value @@ -216,7 +218,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyVal } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h index 52a6807cc44..d35434abe97 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.h +++ b/TAO/tao/PortableServer/LifespanPolicyC.h @@ -101,7 +101,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_LifespanPolicyValue; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -142,6 +142,8 @@ namespace PortableServer // The static operations. static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj); + static void _tao_release (LifespanPolicy_ptr obj); + static LifespanPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -190,7 +192,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -218,7 +220,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_LifespanPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -235,7 +237,7 @@ namespace TAO #if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_) #define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::LifespanPolicy> { static ::PortableServer::LifespanPolicy_ptr duplicate ( diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp index 67c7c7f0aa7..81c02608af0 100644 --- a/TAO/tao/PortableServer/POAManagerA.cpp +++ b/TAO/tao/PortableServer/POAManagerA.cpp @@ -80,7 +80,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_State ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_State = +::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State = &_tc_TAO_tc_PortableServer_POAManager_State; // TAO_IDL - Generated from @@ -117,7 +117,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_POAManager = + ::CORBA::TypeCode_ptr const _tc_POAManager = &_tc_TAO_tc_PortableServer_POAManager; } diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp index 42d794701ed..65837676b28 100644 --- a/TAO/tao/PortableServer/POAManagerC.cpp +++ b/TAO/tao/PortableServer/POAManagerC.cpp @@ -43,7 +43,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -56,7 +56,6 @@ namespace TAO // Traits specializations for PortableServer::POAManager. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POAManager_ptr TAO::Objref_Traits<PortableServer::POAManager>::duplicate ( PortableServer::POAManager_ptr p @@ -65,7 +64,6 @@ TAO::Objref_Traits<PortableServer::POAManager>::duplicate ( return PortableServer::POAManager::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::POAManager>::release ( PortableServer::POAManager_ptr p @@ -74,14 +72,12 @@ TAO::Objref_Traits<PortableServer::POAManager>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POAManager_ptr TAO::Objref_Traits<PortableServer::POAManager>::nil (void) { return PortableServer::POAManager::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::POAManager>::marshal ( PortableServer::POAManager_ptr p, @@ -224,7 +220,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = +::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive = &_tc_TAO_tc_PortableServer_POAManager_AdapterInactive; PortableServer::POAManager::POAManager (void) @@ -286,6 +282,12 @@ PortableServer::POAManager::_duplicate (POAManager_ptr obj) return obj; } +void +PortableServer::POAManager::_tao_release (POAManager_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::POAManager::_is_a ( const char *value @@ -327,7 +329,7 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h index 565881882bb..06900210d7d 100644 --- a/TAO/tao/PortableServer/POAManagerC.h +++ b/TAO/tao/PortableServer/POAManagerC.h @@ -124,6 +124,8 @@ namespace PortableServer // The static operations. static POAManager_ptr _duplicate (POAManager_ptr obj); + static void _tao_release (POAManager_ptr obj); + static POAManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -187,7 +189,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_AdapterInactive; + static ::CORBA::TypeCode_ptr const _tc_AdapterInactive; #endif /* end #if !defined */ @@ -207,7 +209,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_State; + static ::CORBA::TypeCode_ptr const _tc_State; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -272,7 +274,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -300,7 +302,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAManager; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_POAManager; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -317,7 +319,7 @@ namespace TAO #if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_) #define _PORTABLESERVER_POAMANAGER__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager> { static ::PortableServer::POAManager_ptr duplicate ( diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp index 7093aa448ed..eb4f76020b6 100644 --- a/TAO/tao/PortableServer/PS_CurrentA.cpp +++ b/TAO/tao/PortableServer/PS_CurrentA.cpp @@ -64,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_Current = + ::CORBA::TypeCode_ptr const _tc_Current = &_tc_TAO_tc_PortableServer_Current; } diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp index 838252b2232..0c7da8bc0b0 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.cpp +++ b/TAO/tao/PortableServer/PS_CurrentC.cpp @@ -43,7 +43,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -56,7 +56,6 @@ namespace TAO // Traits specializations for PortableServer::Current. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::Current_ptr TAO::Objref_Traits<PortableServer::Current>::duplicate ( PortableServer::Current_ptr p @@ -65,7 +64,6 @@ TAO::Objref_Traits<PortableServer::Current>::duplicate ( return PortableServer::Current::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::Current>::release ( PortableServer::Current_ptr p @@ -74,14 +72,12 @@ TAO::Objref_Traits<PortableServer::Current>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::Current_ptr TAO::Objref_Traits<PortableServer::Current>::nil (void) { return PortableServer::Current::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::Current>::marshal ( PortableServer::Current_ptr p, @@ -221,7 +217,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext ( 0 ); -::CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = +::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext = &_tc_TAO_tc_PortableServer_Current_NoContext; PortableServer::Current::Current (void) @@ -283,6 +279,12 @@ PortableServer::Current::_duplicate (Current_ptr obj) return obj; } +void +PortableServer::Current::_tao_release (Current_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::Current::_is_a ( const char *value @@ -328,7 +330,7 @@ PortableServer::Current::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h index 98d62db6d41..60c7ef9f274 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.h +++ b/TAO/tao/PortableServer/PS_CurrentC.h @@ -127,6 +127,8 @@ namespace PortableServer // The static operations. static Current_ptr _duplicate (Current_ptr obj); + static void _tao_release (Current_ptr obj); + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -190,7 +192,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_NoContext; + static ::CORBA::TypeCode_ptr const _tc_NoContext; #endif /* end #if !defined */ @@ -228,7 +230,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -256,7 +258,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -273,7 +275,7 @@ namespace TAO #if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_) #define _PORTABLESERVER_CURRENT__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::Current> { static ::PortableServer::Current_ptr duplicate ( diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp index 1e56e21d66a..259af27f302 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.cpp +++ b/TAO/tao/PortableServer/PS_ForwardA.cpp @@ -87,7 +87,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ObjectId = + ::CORBA::TypeCode_ptr const _tc_ObjectId = &_tc_TAO_tc_PortableServer_ObjectId; } diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp index bac32a7e17c..2be16bb477c 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.cpp +++ b/TAO/tao/PortableServer/PS_ForwardC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -51,7 +51,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index 92ca576d177..b6451f6ba44 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -98,7 +98,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectId; // TAO_IDL - Generated from // be\be_interface.cpp:598 diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp index fc8410f66eb..5dffc8a5225 100644 --- a/TAO/tao/PortableServer/PortableServerA.cpp +++ b/TAO/tao/PortableServer/PortableServerA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAList ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_POAList = + ::CORBA::TypeCode_ptr const _tc_POAList = &_tc_TAO_tc_PortableServer_POAList; } @@ -105,7 +105,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_POA = + ::CORBA::TypeCode_ptr const _tc_POA = &_tc_TAO_tc_PortableServer_POA; } diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index e7d22f613ea..32ff0cc849d 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -45,7 +45,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -53,7 +53,7 @@ namespace TAO #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_) #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_ - ACE_TEMPLATE_SPECIALIZATION + template<> class TAO_PortableServer_Export Arg_Traits<PortableServer::AdapterActivator> : public Object_Arg_Traits_T< @@ -129,7 +129,6 @@ void PortableServer::POAList::_tao_any_destructor ( // Traits specializations for PortableServer::POA. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POA_ptr TAO::Objref_Traits<PortableServer::POA>::duplicate ( PortableServer::POA_ptr p @@ -138,7 +137,6 @@ TAO::Objref_Traits<PortableServer::POA>::duplicate ( return PortableServer::POA::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::POA>::release ( PortableServer::POA_ptr p @@ -147,14 +145,12 @@ TAO::Objref_Traits<PortableServer::POA>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POA_ptr TAO::Objref_Traits<PortableServer::POA>::nil (void) { return PortableServer::POA::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::POA>::marshal ( PortableServer::POA_ptr p, @@ -298,7 +294,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterAlreadyExists = &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists; // TAO_IDL - Generated from @@ -434,7 +430,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterNonExistent = &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent; // TAO_IDL - Generated from @@ -591,7 +587,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_InvalidPolicy = &_tc_TAO_tc_PortableServer_POA_InvalidPolicy; // TAO_IDL - Generated from @@ -725,7 +721,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant = &_tc_TAO_tc_PortableServer_POA_NoServant; #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ @@ -863,7 +859,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectAlreadyActive = &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive; // TAO_IDL - Generated from @@ -997,7 +993,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectNotActive = &_tc_TAO_tc_PortableServer_POA_ObjectNotActive; // TAO_IDL - Generated from @@ -1134,7 +1130,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantAlreadyActive = &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive; // TAO_IDL - Generated from @@ -1269,7 +1265,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantNotActive = &_tc_TAO_tc_PortableServer_POA_ServantNotActive; // TAO_IDL - Generated from @@ -1402,7 +1398,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongAdapter = &_tc_TAO_tc_PortableServer_POA_WrongAdapter; // TAO_IDL - Generated from @@ -1534,7 +1530,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongPolicy ( 0 ); -::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy = +::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongPolicy = &_tc_TAO_tc_PortableServer_POA_WrongPolicy; PortableServer::POA::POA (void) @@ -1596,6 +1592,12 @@ PortableServer::POA::_duplicate (POA_ptr obj) return obj; } +void +PortableServer::POA::_tao_release (POA_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::POA::_is_a ( const char *value @@ -1637,7 +1639,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 62d6cd62b01..7f75b4765e9 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -162,7 +162,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_POAList; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -307,6 +307,8 @@ namespace PortableServer // The static operations. static POA_ptr _duplicate (POA_ptr obj); + static void _tao_release (POA_ptr obj); + static POA_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -370,7 +372,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_AdapterAlreadyExists; + static ::CORBA::TypeCode_ptr const _tc_AdapterAlreadyExists; #endif /* end #if !defined */ @@ -420,7 +422,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_AdapterNonExistent; + static ::CORBA::TypeCode_ptr const _tc_AdapterNonExistent; #endif /* end #if !defined */ @@ -478,7 +480,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_InvalidPolicy; + static ::CORBA::TypeCode_ptr const _tc_InvalidPolicy; #endif /* end #if !defined */ @@ -530,7 +532,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_NoServant; + static ::CORBA::TypeCode_ptr const _tc_NoServant; #endif /* end #if !defined */ @@ -582,7 +584,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_ObjectAlreadyActive; + static ::CORBA::TypeCode_ptr const _tc_ObjectAlreadyActive; #endif /* end #if !defined */ @@ -632,7 +634,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_ObjectNotActive; + static ::CORBA::TypeCode_ptr const _tc_ObjectNotActive; #endif /* end #if !defined */ @@ -682,7 +684,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_ServantAlreadyActive; + static ::CORBA::TypeCode_ptr const _tc_ServantAlreadyActive; #endif /* end #if !defined */ @@ -732,7 +734,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_ServantNotActive; + static ::CORBA::TypeCode_ptr const _tc_ServantNotActive; #endif /* end #if !defined */ @@ -782,7 +784,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_WrongAdapter; + static ::CORBA::TypeCode_ptr const _tc_WrongAdapter; #endif /* end #if !defined */ @@ -832,7 +834,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_WrongPolicy; + static ::CORBA::TypeCode_ptr const _tc_WrongPolicy; #endif /* end #if !defined */ @@ -1233,7 +1235,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1261,7 +1263,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_POA; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -1278,7 +1280,7 @@ namespace TAO #if !defined (_PORTABLESERVER_POA__TRAITS_CH_) #define _PORTABLESERVER_POA__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA> { static ::PortableServer::POA_ptr duplicate ( diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h index 5c813b75bd5..fc8cea9bfc1 100644 --- a/TAO/tao/PortableServer/PortableServer_includeC.h +++ b/TAO/tao/PortableServer/PortableServer_includeC.h @@ -79,6 +79,10 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:961 +#if defined (__ACE_INLINE__) +#include "PortableServer_includeC.inl" +#endif /* defined INLINE */ + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp index c8f640bf569..d159df57b53 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp @@ -96,7 +96,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue = + ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue = &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue; } @@ -142,7 +142,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicy = + ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy = &_tc_TAO_tc_PortableServer_RequestProcessingPolicy; } diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp index 1fba677be14..674bb549c81 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 #if (TAO_HAS_MINIMUM_POA == 0) @@ -57,7 +57,6 @@ namespace TAO // Traits specializations for PortableServer::RequestProcessingPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::RequestProcessingPolicy_ptr TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate ( PortableServer::RequestProcessingPolicy_ptr p @@ -66,7 +65,6 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate ( return PortableServer::RequestProcessingPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release ( PortableServer::RequestProcessingPolicy_ptr p @@ -75,14 +73,12 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::RequestProcessingPolicy_ptr TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::nil (void) { return PortableServer::RequestProcessingPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::marshal ( PortableServer::RequestProcessingPolicy_ptr p, @@ -151,6 +147,12 @@ PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr return obj; } +void +PortableServer::RequestProcessingPolicy::_tao_release (RequestProcessingPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a ( const char *value @@ -218,7 +220,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h index 225f42741d5..07a3bb34434 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h @@ -103,7 +103,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -144,6 +144,8 @@ namespace PortableServer // The static operations. static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj); + static void _tao_release (RequestProcessingPolicy_ptr obj); + static RequestProcessingPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -192,7 +194,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -220,7 +222,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -239,7 +241,7 @@ namespace TAO #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::RequestProcessingPolicy> { static ::PortableServer::RequestProcessingPolicy_ptr duplicate ( diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp index 565c14858f8..cba7f7021ba 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.cpp +++ b/TAO/tao/PortableServer/ServantActivatorA.cpp @@ -70,7 +70,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ServantActivator = + ::CORBA::TypeCode_ptr const _tc_ServantActivator = &_tc_TAO_tc_PortableServer_ServantActivator; } diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp index d06f1e7ed09..378215f2181 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.cpp +++ b/TAO/tao/PortableServer/ServantActivatorC.cpp @@ -43,7 +43,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 #if (TAO_HAS_MINIMUM_POA == 0) @@ -58,7 +58,6 @@ namespace TAO // Traits specializations for PortableServer::ServantActivator. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantActivator_ptr TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate ( PortableServer::ServantActivator_ptr p @@ -67,7 +66,6 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate ( return PortableServer::ServantActivator::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::ServantActivator>::release ( PortableServer::ServantActivator_ptr p @@ -76,14 +74,12 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantActivator_ptr TAO::Objref_Traits<PortableServer::ServantActivator>::nil (void) { return PortableServer::ServantActivator::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::ServantActivator>::marshal ( PortableServer::ServantActivator_ptr p, @@ -152,6 +148,12 @@ PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj) return obj; } +void +PortableServer::ServantActivator::_tao_release (ServantActivator_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::ServantActivator::_is_a ( const char *value @@ -197,7 +199,7 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h index a7531aaf33d..fd87b4a3f91 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.h +++ b/TAO/tao/PortableServer/ServantActivatorC.h @@ -130,6 +130,8 @@ namespace PortableServer // The static operations. static ServantActivator_ptr _duplicate (ServantActivator_ptr obj); + static void _tao_release (ServantActivator_ptr obj); + static ServantActivator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -176,7 +178,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -204,7 +206,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantActivator; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServantActivator; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -221,7 +223,7 @@ namespace TAO #if !defined (_PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantActivator> { static ::PortableServer::ServantActivator_ptr duplicate ( diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp index 4599983d5ce..59f4b8d8da9 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.cpp +++ b/TAO/tao/PortableServer/ServantLocatorA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ServantLocator = + ::CORBA::TypeCode_ptr const _tc_ServantLocator = &_tc_TAO_tc_PortableServer_ServantLocator; } diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp index bc1a048d7bb..61f65173215 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.cpp +++ b/TAO/tao/PortableServer/ServantLocatorC.cpp @@ -43,7 +43,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 #if (TAO_HAS_MINIMUM_POA == 0) @@ -58,7 +58,6 @@ namespace TAO // Traits specializations for PortableServer::ServantLocator. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantLocator_ptr TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate ( PortableServer::ServantLocator_ptr p @@ -67,7 +66,6 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate ( return PortableServer::ServantLocator::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::ServantLocator>::release ( PortableServer::ServantLocator_ptr p @@ -76,14 +74,12 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantLocator_ptr TAO::Objref_Traits<PortableServer::ServantLocator>::nil (void) { return PortableServer::ServantLocator::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::ServantLocator>::marshal ( PortableServer::ServantLocator_ptr p, @@ -152,6 +148,12 @@ PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj) return obj; } +void +PortableServer::ServantLocator::_tao_release (ServantLocator_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::ServantLocator::_is_a ( const char *value @@ -197,7 +199,7 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index a539a5da9b6..591d00a756d 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -133,6 +133,8 @@ namespace PortableServer // The static operations. static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); + static void _tao_release (ServantLocator_ptr obj); + static ServantLocator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -181,7 +183,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -209,7 +211,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantLocator; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServantLocator; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -226,7 +228,7 @@ namespace TAO #if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_) #define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantLocator> { static ::PortableServer::ServantLocator_ptr duplicate ( diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp index f36c7c4b6c2..7c3e2267bf9 100644 --- a/TAO/tao/PortableServer/ServantManagerA.cpp +++ b/TAO/tao/PortableServer/ServantManagerA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ServantManager = + ::CORBA::TypeCode_ptr const _tc_ServantManager = &_tc_TAO_tc_PortableServer_ServantManager; } diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp index 6aa545e7372..0c7aa5d3fc9 100644 --- a/TAO/tao/PortableServer/ServantManagerC.cpp +++ b/TAO/tao/PortableServer/ServantManagerC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -56,7 +56,6 @@ namespace TAO // Traits specializations for PortableServer::ServantManager. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantManager_ptr TAO::Objref_Traits<PortableServer::ServantManager>::duplicate ( PortableServer::ServantManager_ptr p @@ -65,7 +64,6 @@ TAO::Objref_Traits<PortableServer::ServantManager>::duplicate ( return PortableServer::ServantManager::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::ServantManager>::release ( PortableServer::ServantManager_ptr p @@ -74,14 +72,12 @@ TAO::Objref_Traits<PortableServer::ServantManager>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantManager_ptr TAO::Objref_Traits<PortableServer::ServantManager>::nil (void) { return PortableServer::ServantManager::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::ServantManager>::marshal ( PortableServer::ServantManager_ptr p, @@ -150,6 +146,12 @@ PortableServer::ServantManager::_duplicate (ServantManager_ptr obj) return obj; } +void +PortableServer::ServantManager::_tao_release (ServantManager_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::ServantManager::_is_a ( const char *value @@ -191,7 +193,7 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h index 4ec924301a5..60d4cd1d378 100644 --- a/TAO/tao/PortableServer/ServantManagerC.h +++ b/TAO/tao/PortableServer/ServantManagerC.h @@ -125,6 +125,8 @@ namespace PortableServer // The static operations. static ServantManager_ptr _duplicate (ServantManager_ptr obj); + static void _tao_release (ServantManager_ptr obj); + static ServantManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -143,7 +145,7 @@ namespace PortableServer static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -171,7 +173,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantManager; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServantManager; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -188,7 +190,7 @@ namespace TAO #if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_) #define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager> { static ::PortableServer::ServantManager_ptr duplicate ( diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp index 5e2d4cde106..5ff31abcabf 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp @@ -84,7 +84,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue = + ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue = &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue; } @@ -128,7 +128,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicy = + ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy = &_tc_TAO_tc_PortableServer_ServantRetentionPolicy; } diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp index 2c837f10f80..75a14c1fbd2 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 #if (TAO_HAS_MINIMUM_POA == 0) @@ -57,7 +57,6 @@ namespace TAO // Traits specializations for PortableServer::ServantRetentionPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantRetentionPolicy_ptr TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate ( PortableServer::ServantRetentionPolicy_ptr p @@ -66,7 +65,6 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate ( return PortableServer::ServantRetentionPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release ( PortableServer::ServantRetentionPolicy_ptr p @@ -75,14 +73,12 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantRetentionPolicy_ptr TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::nil (void) { return PortableServer::ServantRetentionPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::marshal ( PortableServer::ServantRetentionPolicy_ptr p, @@ -151,6 +147,12 @@ PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr o return obj; } +void +PortableServer::ServantRetentionPolicy::_tao_release (ServantRetentionPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a ( const char *value @@ -218,7 +220,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionP } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h index 7ff2c2fdb8c..f26a2a1f723 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h @@ -102,7 +102,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -143,6 +143,8 @@ namespace PortableServer // The static operations. static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj); + static void _tao_release (ServantRetentionPolicy_ptr obj); + static ServantRetentionPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -191,7 +193,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -219,7 +221,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -238,7 +240,7 @@ namespace TAO #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantRetentionPolicy> { static ::PortableServer::ServantRetentionPolicy_ptr duplicate ( diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp index c7b31261f44..dc80653c150 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp @@ -84,7 +84,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue = + ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue = &_tc_TAO_tc_PortableServer_ThreadPolicyValue; } @@ -123,7 +123,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy ( namespace PortableServer { - ::CORBA::TypeCode_ptr _tc_ThreadPolicy = + ::CORBA::TypeCode_ptr const _tc_ThreadPolicy = &_tc_TAO_tc_PortableServer_ThreadPolicy; } diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp index 4e4e02be038..d001ecf7eb7 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 #if (TAO_HAS_MINIMUM_POA == 0) @@ -57,7 +57,6 @@ namespace TAO // Traits specializations for PortableServer::ThreadPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ThreadPolicy_ptr TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate ( PortableServer::ThreadPolicy_ptr p @@ -66,7 +65,6 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate ( return PortableServer::ThreadPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<PortableServer::ThreadPolicy>::release ( PortableServer::ThreadPolicy_ptr p @@ -75,14 +73,12 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ThreadPolicy_ptr TAO::Objref_Traits<PortableServer::ThreadPolicy>::nil (void) { return PortableServer::ThreadPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<PortableServer::ThreadPolicy>::marshal ( PortableServer::ThreadPolicy_ptr p, @@ -151,6 +147,12 @@ PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj) return obj; } +void +PortableServer::ThreadPolicy::_tao_release (ThreadPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean PortableServer::ThreadPolicy::_is_a ( const char *value @@ -218,7 +220,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h index 6160f35e73d..961dc75b065 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.h +++ b/TAO/tao/PortableServer/ThreadPolicyC.h @@ -102,7 +102,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -143,6 +143,8 @@ namespace PortableServer // The static operations. static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj); + static void _tao_release (ThreadPolicy_ptr obj); + static ThreadPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -191,7 +193,7 @@ namespace PortableServer )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -219,7 +221,7 @@ namespace PortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -238,7 +240,7 @@ namespace TAO #if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_) #define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ThreadPolicy> { static ::PortableServer::ThreadPolicy_ptr duplicate ( diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp index b4e70db3d7f..3d34019d6e4 100644 --- a/TAO/tao/RTCORBA/RTCORBAA.cpp +++ b/TAO/tao/RTCORBA/RTCORBAA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NativePriority ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_NativePriority = + ::CORBA::TypeCode_ptr const _tc_NativePriority = &_tc_TAO_tc_RTCORBA_NativePriority; } @@ -107,7 +107,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Priority ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_Priority = + ::CORBA::TypeCode_ptr const _tc_Priority = &_tc_TAO_tc_RTCORBA_Priority; } @@ -147,7 +147,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NetworkPriority ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_NetworkPriority = + ::CORBA::TypeCode_ptr const _tc_NetworkPriority = &_tc_TAO_tc_RTCORBA_NetworkPriority; } @@ -187,7 +187,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolId ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_ThreadpoolId = + ::CORBA::TypeCode_ptr const _tc_ThreadpoolId = &_tc_TAO_tc_RTCORBA_ThreadpoolId; } @@ -265,7 +265,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLane ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_ThreadpoolLane = + ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane = &_tc_TAO_tc_RTCORBA_ThreadpoolLane; } @@ -368,7 +368,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLanes ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes = + ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes = &_tc_TAO_tc_RTCORBA_ThreadpoolLanes; } @@ -418,7 +418,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModel ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_PriorityModel = + ::CORBA::TypeCode_ptr const _tc_PriorityModel = &_tc_TAO_tc_RTCORBA_PriorityModel; } @@ -458,7 +458,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModelPolicy ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy = + ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy = &_tc_TAO_tc_RTCORBA_PriorityModelPolicy; } @@ -498,7 +498,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolPolicy ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy = + ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy = &_tc_TAO_tc_RTCORBA_ThreadpoolPolicy; } @@ -538,7 +538,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolProperties ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_ProtocolProperties = + ::CORBA::TypeCode_ptr const _tc_ProtocolProperties = &_tc_TAO_tc_RTCORBA_ProtocolProperties; } @@ -659,7 +659,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_Protocol = + ::CORBA::TypeCode_ptr const _tc_Protocol = &_tc_TAO_tc_RTCORBA_Protocol; } @@ -805,7 +805,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolList ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_ProtocolList = + ::CORBA::TypeCode_ptr const _tc_ProtocolList = &_tc_TAO_tc_RTCORBA_ProtocolList; } @@ -847,7 +847,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ServerProtocolPolicy ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy = + ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy = &_tc_TAO_tc_RTCORBA_ServerProtocolPolicy; } @@ -889,7 +889,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ClientProtocolPolicy ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy = + ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy = &_tc_TAO_tc_RTCORBA_ClientProtocolPolicy; } @@ -931,7 +931,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PrivateConnectionPolicy ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy = + ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy = &_tc_TAO_tc_RTCORBA_PrivateConnectionPolicy; } @@ -973,7 +973,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_TCPProtocolProperties ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties = + ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties = &_tc_TAO_tc_RTCORBA_TCPProtocolProperties; } @@ -1015,7 +1015,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_GIOPProtocolProperties ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties = + ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties = &_tc_TAO_tc_RTCORBA_GIOPProtocolProperties; } @@ -1061,7 +1061,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties = + ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties = &_tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties; } @@ -1107,7 +1107,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties = + ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties = &_tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties; } @@ -1153,7 +1153,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_UserDatagramProtocolProperties = + ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties = &_tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties; } @@ -1199,7 +1199,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_StreamControlProtocolProperties ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_StreamControlProtocolProperties = + ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties = &_tc_TAO_tc_RTCORBA_StreamControlProtocolProperties; } @@ -1283,7 +1283,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_PriorityBand = + ::CORBA::TypeCode_ptr const _tc_PriorityBand = &_tc_TAO_tc_RTCORBA_PriorityBand; } @@ -1392,7 +1392,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_PriorityBands = + ::CORBA::TypeCode_ptr const _tc_PriorityBands = &_tc_TAO_tc_RTCORBA_PriorityBands; } @@ -1438,7 +1438,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy = + ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy = &_tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy; } @@ -1472,7 +1472,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Current ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_Current = + ::CORBA::TypeCode_ptr const _tc_Current = &_tc_TAO_tc_RTCORBA_Current; } @@ -1506,7 +1506,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Mutex ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_Mutex = + ::CORBA::TypeCode_ptr const _tc_Mutex = &_tc_TAO_tc_RTCORBA_Mutex; } @@ -1540,7 +1540,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB ( namespace RTCORBA { - ::CORBA::TypeCode_ptr _tc_RTORB = + ::CORBA::TypeCode_ptr const _tc_RTORB = &_tc_TAO_tc_RTCORBA_RTORB; } diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 2002a22e02c..c2fd1afc254 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -46,7 +46,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -141,7 +141,6 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor ( // Traits specializations for RTCORBA::PriorityModelPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityModelPolicy_ptr TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::duplicate ( RTCORBA::PriorityModelPolicy_ptr p @@ -150,7 +149,6 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::duplicate ( return RTCORBA::PriorityModelPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release ( RTCORBA::PriorityModelPolicy_ptr p @@ -159,14 +157,12 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityModelPolicy_ptr TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::nil (void) { return RTCORBA::PriorityModelPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal ( RTCORBA::PriorityModelPolicy_ptr p, @@ -235,6 +231,12 @@ RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj) return obj; } +void +RTCORBA::PriorityModelPolicy::_tao_release (PriorityModelPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::PriorityModelPolicy::_is_a ( const char *value @@ -284,7 +286,6 @@ RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::ThreadpoolPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ThreadpoolPolicy_ptr TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::duplicate ( RTCORBA::ThreadpoolPolicy_ptr p @@ -293,7 +294,6 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::duplicate ( return RTCORBA::ThreadpoolPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release ( RTCORBA::ThreadpoolPolicy_ptr p @@ -302,14 +302,12 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ThreadpoolPolicy_ptr TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::nil (void) { return RTCORBA::ThreadpoolPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal ( RTCORBA::ThreadpoolPolicy_ptr p, @@ -378,6 +376,12 @@ RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj) return obj; } +void +RTCORBA::ThreadpoolPolicy::_tao_release (ThreadpoolPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::ThreadpoolPolicy::_is_a ( const char *value @@ -427,7 +431,6 @@ RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::ProtocolProperties. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::ProtocolProperties>::duplicate ( RTCORBA::ProtocolProperties_ptr p @@ -436,7 +439,6 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::duplicate ( return RTCORBA::ProtocolProperties::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release ( RTCORBA::ProtocolProperties_ptr p @@ -445,14 +447,12 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil (void) { return RTCORBA::ProtocolProperties::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal ( RTCORBA::ProtocolProperties_ptr p, @@ -521,6 +521,12 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj) return obj; } +void +RTCORBA::ProtocolProperties::_tao_release (ProtocolProperties_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::ProtocolProperties::_is_a ( const char *value @@ -632,7 +638,6 @@ void RTCORBA::ProtocolList::_tao_any_destructor ( // Traits specializations for RTCORBA::ServerProtocolPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ServerProtocolPolicy_ptr TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::duplicate ( RTCORBA::ServerProtocolPolicy_ptr p @@ -641,7 +646,6 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::duplicate ( return RTCORBA::ServerProtocolPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release ( RTCORBA::ServerProtocolPolicy_ptr p @@ -650,14 +654,12 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ServerProtocolPolicy_ptr TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::nil (void) { return RTCORBA::ServerProtocolPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal ( RTCORBA::ServerProtocolPolicy_ptr p, @@ -726,6 +728,12 @@ RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj) return obj; } +void +RTCORBA::ServerProtocolPolicy::_tao_release (ServerProtocolPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::ServerProtocolPolicy::_is_a ( const char *value @@ -775,7 +783,6 @@ RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::ClientProtocolPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ClientProtocolPolicy_ptr TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::duplicate ( RTCORBA::ClientProtocolPolicy_ptr p @@ -784,7 +791,6 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::duplicate ( return RTCORBA::ClientProtocolPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release ( RTCORBA::ClientProtocolPolicy_ptr p @@ -793,14 +799,12 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ClientProtocolPolicy_ptr TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::nil (void) { return RTCORBA::ClientProtocolPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal ( RTCORBA::ClientProtocolPolicy_ptr p, @@ -869,6 +873,12 @@ RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj) return obj; } +void +RTCORBA::ClientProtocolPolicy::_tao_release (ClientProtocolPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::ClientProtocolPolicy::_is_a ( const char *value @@ -918,7 +928,6 @@ RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::PrivateConnectionPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PrivateConnectionPolicy_ptr TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::duplicate ( RTCORBA::PrivateConnectionPolicy_ptr p @@ -927,7 +936,6 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::duplicate ( return RTCORBA::PrivateConnectionPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release ( RTCORBA::PrivateConnectionPolicy_ptr p @@ -936,14 +944,12 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PrivateConnectionPolicy_ptr TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::nil (void) { return RTCORBA::PrivateConnectionPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal ( RTCORBA::PrivateConnectionPolicy_ptr p, @@ -1012,6 +1018,12 @@ RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj) return obj; } +void +RTCORBA::PrivateConnectionPolicy::_tao_release (PrivateConnectionPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::PrivateConnectionPolicy::_is_a ( const char *value @@ -1061,7 +1073,6 @@ RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::TCPProtocolProperties. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::TCPProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::duplicate ( RTCORBA::TCPProtocolProperties_ptr p @@ -1070,7 +1081,6 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::duplicate ( return RTCORBA::TCPProtocolProperties::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release ( RTCORBA::TCPProtocolProperties_ptr p @@ -1079,14 +1089,12 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::TCPProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::nil (void) { return RTCORBA::TCPProtocolProperties::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal ( RTCORBA::TCPProtocolProperties_ptr p, @@ -1155,6 +1163,12 @@ RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj) return obj; } +void +RTCORBA::TCPProtocolProperties::_tao_release (TCPProtocolProperties_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::TCPProtocolProperties::_is_a ( const char *value @@ -1204,7 +1218,6 @@ RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::GIOPProtocolProperties. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::GIOPProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::duplicate ( RTCORBA::GIOPProtocolProperties_ptr p @@ -1213,7 +1226,6 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::duplicate ( return RTCORBA::GIOPProtocolProperties::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release ( RTCORBA::GIOPProtocolProperties_ptr p @@ -1222,14 +1234,12 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::GIOPProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::nil (void) { return RTCORBA::GIOPProtocolProperties::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal ( RTCORBA::GIOPProtocolProperties_ptr p, @@ -1298,6 +1308,12 @@ RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj) return obj; } +void +RTCORBA::GIOPProtocolProperties::_tao_release (GIOPProtocolProperties_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::GIOPProtocolProperties::_is_a ( const char *value @@ -1347,7 +1363,6 @@ RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::UnixDomainProtocolProperties. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::UnixDomainProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::duplicate ( RTCORBA::UnixDomainProtocolProperties_ptr p @@ -1356,7 +1371,6 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::duplicate ( return RTCORBA::UnixDomainProtocolProperties::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release ( RTCORBA::UnixDomainProtocolProperties_ptr p @@ -1365,14 +1379,12 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::UnixDomainProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::nil (void) { return RTCORBA::UnixDomainProtocolProperties::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal ( RTCORBA::UnixDomainProtocolProperties_ptr p, @@ -1441,6 +1453,12 @@ RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ return obj; } +void +RTCORBA::UnixDomainProtocolProperties::_tao_release (UnixDomainProtocolProperties_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::UnixDomainProtocolProperties::_is_a ( const char *value @@ -1490,7 +1508,6 @@ RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::SharedMemoryProtocolProperties. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::SharedMemoryProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::duplicate ( RTCORBA::SharedMemoryProtocolProperties_ptr p @@ -1499,7 +1516,6 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::duplicate ( return RTCORBA::SharedMemoryProtocolProperties::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release ( RTCORBA::SharedMemoryProtocolProperties_ptr p @@ -1508,14 +1524,12 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::SharedMemoryProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::nil (void) { return RTCORBA::SharedMemoryProtocolProperties::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal ( RTCORBA::SharedMemoryProtocolProperties_ptr p, @@ -1584,6 +1598,12 @@ RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolPropert return obj; } +void +RTCORBA::SharedMemoryProtocolProperties::_tao_release (SharedMemoryProtocolProperties_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::SharedMemoryProtocolProperties::_is_a ( const char *value @@ -1633,7 +1653,6 @@ RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::UserDatagramProtocolProperties. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::UserDatagramProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::duplicate ( RTCORBA::UserDatagramProtocolProperties_ptr p @@ -1642,7 +1661,6 @@ TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::duplicate ( return RTCORBA::UserDatagramProtocolProperties::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::release ( RTCORBA::UserDatagramProtocolProperties_ptr p @@ -1651,14 +1669,12 @@ TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::UserDatagramProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::nil (void) { return RTCORBA::UserDatagramProtocolProperties::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::marshal ( RTCORBA::UserDatagramProtocolProperties_ptr p, @@ -1727,6 +1743,12 @@ RTCORBA::UserDatagramProtocolProperties::_duplicate (UserDatagramProtocolPropert return obj; } +void +RTCORBA::UserDatagramProtocolProperties::_tao_release (UserDatagramProtocolProperties_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::UserDatagramProtocolProperties::_is_a ( const char *value @@ -1776,7 +1798,6 @@ RTCORBA::UserDatagramProtocolProperties::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::StreamControlProtocolProperties. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::StreamControlProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::duplicate ( RTCORBA::StreamControlProtocolProperties_ptr p @@ -1785,7 +1806,6 @@ TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::duplicate ( return RTCORBA::StreamControlProtocolProperties::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::release ( RTCORBA::StreamControlProtocolProperties_ptr p @@ -1794,14 +1814,12 @@ TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::StreamControlProtocolProperties_ptr TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::nil (void) { return RTCORBA::StreamControlProtocolProperties::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::marshal ( RTCORBA::StreamControlProtocolProperties_ptr p, @@ -1870,6 +1888,12 @@ RTCORBA::StreamControlProtocolProperties::_duplicate (StreamControlProtocolPrope return obj; } +void +RTCORBA::StreamControlProtocolProperties::_tao_release (StreamControlProtocolProperties_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::StreamControlProtocolProperties::_is_a ( const char *value @@ -1985,7 +2009,6 @@ void RTCORBA::PriorityBands::_tao_any_destructor ( // Traits specializations for RTCORBA::PriorityBandedConnectionPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityBandedConnectionPolicy_ptr TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::duplicate ( RTCORBA::PriorityBandedConnectionPolicy_ptr p @@ -1994,7 +2017,6 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::duplicate ( return RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release ( RTCORBA::PriorityBandedConnectionPolicy_ptr p @@ -2003,14 +2025,12 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityBandedConnectionPolicy_ptr TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::nil (void) { return RTCORBA::PriorityBandedConnectionPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal ( RTCORBA::PriorityBandedConnectionPolicy_ptr p, @@ -2079,6 +2099,12 @@ RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPol return obj; } +void +RTCORBA::PriorityBandedConnectionPolicy::_tao_release (PriorityBandedConnectionPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::PriorityBandedConnectionPolicy::_is_a ( const char *value @@ -2128,7 +2154,6 @@ RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::Current. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Current_ptr TAO::Objref_Traits<RTCORBA::Current>::duplicate ( RTCORBA::Current_ptr p @@ -2137,7 +2162,6 @@ TAO::Objref_Traits<RTCORBA::Current>::duplicate ( return RTCORBA::Current::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::Current>::release ( RTCORBA::Current_ptr p @@ -2146,14 +2170,12 @@ TAO::Objref_Traits<RTCORBA::Current>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Current_ptr TAO::Objref_Traits<RTCORBA::Current>::nil (void) { return RTCORBA::Current::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::Current>::marshal ( RTCORBA::Current_ptr p, @@ -2222,6 +2244,12 @@ RTCORBA::Current::_duplicate (Current_ptr obj) return obj; } +void +RTCORBA::Current::_tao_release (Current_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::Current::_is_a ( const char *value @@ -2271,7 +2299,6 @@ RTCORBA::Current::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::Mutex. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Mutex_ptr TAO::Objref_Traits<RTCORBA::Mutex>::duplicate ( RTCORBA::Mutex_ptr p @@ -2280,7 +2307,6 @@ TAO::Objref_Traits<RTCORBA::Mutex>::duplicate ( return RTCORBA::Mutex::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::Mutex>::release ( RTCORBA::Mutex_ptr p @@ -2289,14 +2315,12 @@ TAO::Objref_Traits<RTCORBA::Mutex>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Mutex_ptr TAO::Objref_Traits<RTCORBA::Mutex>::nil (void) { return RTCORBA::Mutex::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::Mutex>::marshal ( RTCORBA::Mutex_ptr p, @@ -2365,6 +2389,12 @@ RTCORBA::Mutex::_duplicate (Mutex_ptr obj) return obj; } +void +RTCORBA::Mutex::_tao_release (Mutex_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::Mutex::_is_a ( const char *value @@ -2410,7 +2440,6 @@ RTCORBA::Mutex::marshal (TAO_OutputCDR &) // Traits specializations for RTCORBA::RTORB. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::RTORB_ptr TAO::Objref_Traits<RTCORBA::RTORB>::duplicate ( RTCORBA::RTORB_ptr p @@ -2419,7 +2448,6 @@ TAO::Objref_Traits<RTCORBA::RTORB>::duplicate ( return RTCORBA::RTORB::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<RTCORBA::RTORB>::release ( RTCORBA::RTORB_ptr p @@ -2428,14 +2456,12 @@ TAO::Objref_Traits<RTCORBA::RTORB>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::RTORB_ptr TAO::Objref_Traits<RTCORBA::RTORB>::nil (void) { return RTCORBA::RTORB::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<RTCORBA::RTORB>::marshal ( RTCORBA::RTORB_ptr p, @@ -2574,7 +2600,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound ( 0 ); -::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_MutexNotFound = +::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_MutexNotFound = &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound; // TAO_IDL - Generated from @@ -2708,7 +2734,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool ( 0 ); -::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_InvalidThreadpool = +::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_InvalidThreadpool = &_tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool; RTCORBA::RTORB::RTORB (void) @@ -2770,6 +2796,12 @@ RTCORBA::RTORB::_duplicate (RTORB_ptr obj) return obj; } +void +RTCORBA::RTORB::_tao_release (RTORB_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean RTCORBA::RTORB::_is_a ( const char *value @@ -3025,7 +3057,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 894fd4da1dd..92d917acded 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -57,9 +57,11 @@ #include "tao/Seq_Out_T.h" #include "tao/VarOut_T.h" #include "tao/Encodable.h" -#include "tao/PolicyC.h" #include "tao/IOPC.h" +#include "tao/TimeBaseC.h" +#include "tao/PolicyC.h" + #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif @@ -81,13 +83,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; } @@ -97,102 +99,102 @@ namespace TAO namespace RTCORBA { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 - + typedef CORBA::Short NativePriority; typedef CORBA::Short_out NativePriority_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority; - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_NativePriority; + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 - + typedef CORBA::Short Priority; typedef CORBA::Short_out Priority_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority; - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Priority; + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const RTCORBA::Priority minPriority = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const RTCORBA::Priority maxPriority = 32767; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 - + typedef CORBA::Long NetworkPriority; typedef CORBA::Long_out NetworkPriority_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NetworkPriority; - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_NetworkPriority; + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 - + typedef CORBA::ULong ThreadpoolId; typedef CORBA::ULong_out ThreadpoolId_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId; - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadpoolId; + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ThreadpoolLane; - + typedef TAO_Fixed_Var_T< ThreadpoolLane > ThreadpoolLane_var; - + typedef ThreadpoolLane & ThreadpoolLane_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_RTCORBA_Export ThreadpoolLane { typedef ThreadpoolLane_var _var_type; - + static void _tao_any_destructor (void *); RTCORBA::Priority lane_priority; CORBA::ULong static_threads; CORBA::ULong dynamic_threads; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane; - + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane; + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_RTCORBA_THREADPOOLLANES_CH_) #define _RTCORBA_THREADPOOLLANES_CH_ - + class ThreadpoolLanes; - + typedef TAO_FixedSeq_Var_T< ThreadpoolLanes, @@ -236,7 +238,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -257,7 +259,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PriorityModel; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -298,6 +300,8 @@ namespace RTCORBA // The static operations. static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj); + static void _tao_release (PriorityModelPolicy_ptr obj); + static PriorityModelPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -356,7 +360,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -384,7 +388,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -430,6 +434,8 @@ namespace RTCORBA // The static operations. static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj); + static void _tao_release (ThreadpoolPolicy_ptr obj); + static ThreadpoolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -478,7 +484,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -506,7 +512,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -548,6 +554,8 @@ namespace RTCORBA // The static operations. static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj); + static void _tao_release (ProtocolProperties_ptr obj); + static ProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -566,7 +574,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -597,7 +605,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolProperties; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ProtocolProperties; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -633,7 +641,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Protocol; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Protocol; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -686,7 +694,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolList; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ProtocolList; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -732,6 +740,8 @@ namespace RTCORBA // The static operations. static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj); + static void _tao_release (ServerProtocolPolicy_ptr obj); + static ServerProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -780,7 +790,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -808,7 +818,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -854,6 +864,8 @@ namespace RTCORBA // The static operations. static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj); + static void _tao_release (ClientProtocolPolicy_ptr obj); + static ClientProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -902,7 +914,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -930,7 +942,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -976,6 +988,8 @@ namespace RTCORBA // The static operations. static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj); + static void _tao_release (PrivateConnectionPolicy_ptr obj); + static PrivateConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1014,7 +1028,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1042,7 +1056,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1083,6 +1097,8 @@ namespace RTCORBA // The static operations. static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj); + static void _tao_release (TCPProtocolProperties_ptr obj); + static TCPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1227,7 +1243,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1255,7 +1271,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1296,6 +1312,8 @@ namespace RTCORBA // The static operations. static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj); + static void _tao_release (GIOPProtocolProperties_ptr obj); + static GIOPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1314,7 +1332,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1342,7 +1360,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1383,6 +1401,8 @@ namespace RTCORBA // The static operations. static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj); + static void _tao_release (UnixDomainProtocolProperties_ptr obj); + static UnixDomainProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1443,7 +1463,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1471,7 +1491,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1512,6 +1532,8 @@ namespace RTCORBA // The static operations. static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj); + static void _tao_release (SharedMemoryProtocolProperties_ptr obj); + static SharedMemoryProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1698,7 +1720,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1726,7 +1748,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1767,6 +1789,8 @@ namespace RTCORBA // The static operations. static UserDatagramProtocolProperties_ptr _duplicate (UserDatagramProtocolProperties_ptr obj); + static void _tao_release (UserDatagramProtocolProperties_ptr obj); + static UserDatagramProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1806,7 +1830,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1834,7 +1858,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UserDatagramProtocolProperties; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1875,6 +1899,8 @@ namespace RTCORBA // The static operations. static StreamControlProtocolProperties_ptr _duplicate (StreamControlProtocolProperties_ptr obj); + static void _tao_release (StreamControlProtocolProperties_ptr obj); + static StreamControlProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2019,7 +2045,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2047,7 +2073,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StreamControlProtocolProperties; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -2079,7 +2105,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBand; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PriorityBand; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -2132,7 +2158,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBands; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PriorityBands; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -2178,6 +2204,8 @@ namespace RTCORBA // The static operations. static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj); + static void _tao_release (PriorityBandedConnectionPolicy_ptr obj); + static PriorityBandedConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2226,7 +2254,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2254,7 +2282,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -2295,6 +2323,8 @@ namespace RTCORBA // The static operations. static Current_ptr _duplicate (Current_ptr obj); + static void _tao_release (Current_ptr obj); + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2334,7 +2364,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2362,7 +2392,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -2403,6 +2433,8 @@ namespace RTCORBA // The static operations. static Mutex_ptr _duplicate (Mutex_ptr obj); + static void _tao_release (Mutex_ptr obj); + static Mutex_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2452,7 +2484,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2480,7 +2512,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Mutex; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -2521,6 +2553,8 @@ namespace RTCORBA // The static operations. static RTORB_ptr _duplicate (RTORB_ptr obj); + static void _tao_release (RTORB_ptr obj); + static RTORB_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2605,7 +2639,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_MutexNotFound; + static ::CORBA::TypeCode_ptr const _tc_MutexNotFound; #endif /* end #if !defined */ @@ -2752,7 +2786,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - static ::CORBA::TypeCode_ptr _tc_InvalidThreadpool; + static ::CORBA::TypeCode_ptr const _tc_InvalidThreadpool; #endif /* end #if !defined */ @@ -2868,7 +2902,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2896,7 +2930,7 @@ namespace RTCORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RTORB; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RTORB; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -2913,7 +2947,7 @@ namespace TAO #if !defined (_RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_) #define _RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityModelPolicy> { static ::RTCORBA::PriorityModelPolicy_ptr duplicate ( @@ -2934,7 +2968,7 @@ namespace TAO #if !defined (_RTCORBA_THREADPOOLPOLICY__TRAITS_CH_) #define _RTCORBA_THREADPOOLPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ThreadpoolPolicy> { static ::RTCORBA::ThreadpoolPolicy_ptr duplicate ( @@ -2955,7 +2989,7 @@ namespace TAO #if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_) #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ProtocolProperties> { static ::RTCORBA::ProtocolProperties_ptr duplicate ( @@ -2976,7 +3010,7 @@ namespace TAO #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_) #define _RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ServerProtocolPolicy> { static ::RTCORBA::ServerProtocolPolicy_ptr duplicate ( @@ -2997,7 +3031,7 @@ namespace TAO #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_) #define _RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ClientProtocolPolicy> { static ::RTCORBA::ClientProtocolPolicy_ptr duplicate ( @@ -3018,7 +3052,7 @@ namespace TAO #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_) #define _RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PrivateConnectionPolicy> { static ::RTCORBA::PrivateConnectionPolicy_ptr duplicate ( @@ -3039,7 +3073,7 @@ namespace TAO #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_) #define _RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::TCPProtocolProperties> { static ::RTCORBA::TCPProtocolProperties_ptr duplicate ( @@ -3060,7 +3094,7 @@ namespace TAO #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_) #define _RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::GIOPProtocolProperties> { static ::RTCORBA::GIOPProtocolProperties_ptr duplicate ( @@ -3081,7 +3115,7 @@ namespace TAO #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_) #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::UnixDomainProtocolProperties> { static ::RTCORBA::UnixDomainProtocolProperties_ptr duplicate ( @@ -3102,7 +3136,7 @@ namespace TAO #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_) #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::SharedMemoryProtocolProperties> { static ::RTCORBA::SharedMemoryProtocolProperties_ptr duplicate ( @@ -3123,7 +3157,7 @@ namespace TAO #if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__TRAITS_CH_) #define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::UserDatagramProtocolProperties> { static ::RTCORBA::UserDatagramProtocolProperties_ptr duplicate ( @@ -3144,7 +3178,7 @@ namespace TAO #if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__TRAITS_CH_) #define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::StreamControlProtocolProperties> { static ::RTCORBA::StreamControlProtocolProperties_ptr duplicate ( @@ -3165,7 +3199,7 @@ namespace TAO #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_) #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityBandedConnectionPolicy> { static ::RTCORBA::PriorityBandedConnectionPolicy_ptr duplicate ( @@ -3186,7 +3220,7 @@ namespace TAO #if !defined (_RTCORBA_CURRENT__TRAITS_CH_) #define _RTCORBA_CURRENT__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Current> { static ::RTCORBA::Current_ptr duplicate ( @@ -3207,7 +3241,7 @@ namespace TAO #if !defined (_RTCORBA_MUTEX__TRAITS_CH_) #define _RTCORBA_MUTEX__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Mutex> { static ::RTCORBA::Mutex_ptr duplicate ( @@ -3228,7 +3262,7 @@ namespace TAO #if !defined (_RTCORBA_RTORB__TRAITS_CH_) #define _RTCORBA_RTORB__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::RTORB> { static ::RTCORBA::RTORB_ptr duplicate ( diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp index 3ba20f81ae4..ca5c011bb64 100644 --- a/TAO/tao/ServicesA.cpp +++ b/TAO/tao/ServicesA.cpp @@ -65,7 +65,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ServiceType = + ::CORBA::TypeCode_ptr const _tc_ServiceType = &_tc_TAO_tc_CORBA_ServiceType; } @@ -104,7 +104,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ServiceOption = + ::CORBA::TypeCode_ptr const _tc_ServiceOption = &_tc_TAO_tc_CORBA_ServiceOption; } @@ -145,7 +145,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ServiceDetailType = + ::CORBA::TypeCode_ptr const _tc_ServiceDetailType = &_tc_TAO_tc_CORBA_ServiceDetailType; } @@ -241,7 +241,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ServiceDetail = + ::CORBA::TypeCode_ptr const _tc_ServiceDetail = &_tc_TAO_tc_CORBA_ServiceDetail; } @@ -306,7 +306,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOptionSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ServiceOptionSeq = + ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq = &_tc_TAO_tc_CORBA_ServiceOptionSeq; } @@ -428,7 +428,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ServiceDetailSeq = + ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq = &_tc_TAO_tc_CORBA_ServiceDetailSeq; } @@ -630,7 +630,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ServiceInformation = + ::CORBA::TypeCode_ptr const _tc_ServiceInformation = &_tc_TAO_tc_CORBA_ServiceInformation; } diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index e695c1bf8e9..b362269f44c 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -359,7 +359,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h index b8ace277bdf..bc7af68cede 100644 --- a/TAO/tao/ServicesC.h +++ b/TAO/tao/ServicesC.h @@ -86,7 +86,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceType; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceType; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -97,7 +97,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceOption; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceOption; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -108,7 +108,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetailType; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetailType; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -148,7 +148,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetail; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetail; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -201,7 +201,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceOptionSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -254,7 +254,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetailSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -289,7 +289,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceInformation; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceInformation; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp index d726cffce46..2aacbfdb443 100644 --- a/TAO/tao/ShortSeqA.cpp +++ b/TAO/tao/ShortSeqA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ShortSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ShortSeq = + ::CORBA::TypeCode_ptr const _tc_ShortSeq = &_tc_TAO_tc_CORBA_ShortSeq; } diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp index 463a6d18b49..22bae6f2335 100644 --- a/TAO/tao/ShortSeqC.cpp +++ b/TAO/tao/ShortSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h index d055abe73af..65037a49c02 100644 --- a/TAO/tao/ShortSeqC.h +++ b/TAO/tao/ShortSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ShortSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ShortSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp index 846debd86bb..7dc6550de26 100644 --- a/TAO/tao/StringSeqA.cpp +++ b/TAO/tao/StringSeqA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_StringSeq = + ::CORBA::TypeCode_ptr const _tc_StringSeq = &_tc_TAO_tc_CORBA_StringSeq; } diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 48b6bad7fa9..9d470712e8f 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -170,7 +170,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h index 78a6e5d5608..cc40bda680b 100644 --- a/TAO/tao/StringSeqC.h +++ b/TAO/tao/StringSeqC.h @@ -123,7 +123,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_StringSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp index 8c542dfdc09..6b22ec209db 100644 --- a/TAO/tao/TAOA.cpp +++ b/TAO/tao/TAOA.cpp @@ -70,7 +70,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode ( namespace TAO { - ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode = + ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode = &_tc_TAO_tc_TAO_BufferingConstraintMode; } @@ -171,7 +171,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint ( namespace TAO { - ::CORBA::TypeCode_ptr _tc_BufferingConstraint = + ::CORBA::TypeCode_ptr const _tc_BufferingConstraint = &_tc_TAO_tc_TAO_BufferingConstraint; } @@ -213,7 +213,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy ( namespace TAO { - ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy = + ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy = &_tc_TAO_tc_TAO_BufferingConstraintPolicy; } diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index b63e16f3d7d..6127d51663c 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -42,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -68,7 +68,6 @@ TAO::BufferingConstraint::_tao_any_destructor ( // Traits specializations for TAO::BufferingConstraintPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::BufferingConstraintPolicy_ptr TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::duplicate ( TAO::BufferingConstraintPolicy_ptr p @@ -77,7 +76,6 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::duplicate ( return TAO::BufferingConstraintPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release ( TAO::BufferingConstraintPolicy_ptr p @@ -86,14 +84,12 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::BufferingConstraintPolicy_ptr TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::nil (void) { return TAO::BufferingConstraintPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal ( TAO::BufferingConstraintPolicy_ptr p, @@ -162,6 +158,12 @@ TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj) return obj; } +void +TAO::BufferingConstraintPolicy::_tao_release (BufferingConstraintPolicy_ptr obj) +{ + CORBA::release (obj); +} + CORBA::Boolean TAO::BufferingConstraintPolicy::_is_a ( const char *value @@ -234,7 +236,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index aa41c3d410c..699de18453f 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -99,7 +99,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -153,7 +153,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_BufferingConstraint; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -199,6 +199,8 @@ namespace TAO // The static operations. static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); + static void _tao_release (BufferingConstraintPolicy_ptr obj); + static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -247,7 +249,7 @@ namespace TAO )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:208 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -275,7 +277,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -302,7 +304,7 @@ namespace TAO #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits< ::TAO::BufferingConstraintPolicy> { static ::TAO::BufferingConstraintPolicy_ptr duplicate ( diff --git a/TAO/tao/TC_Constants_Forward.h b/TAO/tao/TC_Constants_Forward.h index bb23cb8331a..93df81213df 100644 --- a/TAO/tao/TC_Constants_Forward.h +++ b/TAO/tao/TC_Constants_Forward.h @@ -100,7 +100,7 @@ namespace CORBA extern TAO_Export TypeCode_ptr _tc_UnknownUserException; - extern TAO_Export TypeCode_ptr _tc_Current; + extern TAO_Export TypeCode_ptr const _tc_Current; extern TAO_Export TypeCode_ptr _tc_NamedValue; } diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp index 7e37b1933ae..4f95a2e8ce0 100644 --- a/TAO/tao/TimeBaseA.cpp +++ b/TAO/tao/TimeBaseA.cpp @@ -63,7 +63,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT ( namespace TimeBase { - ::CORBA::TypeCode_ptr _tc_TimeT = + ::CORBA::TypeCode_ptr const _tc_TimeT = &_tc_TAO_tc_TimeBase_TimeT; } @@ -118,7 +118,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT ( namespace TimeBase { - ::CORBA::TypeCode_ptr _tc_InaccuracyT = + ::CORBA::TypeCode_ptr const _tc_InaccuracyT = &_tc_TAO_tc_TimeBase_InaccuracyT; } @@ -154,7 +154,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT ( namespace TimeBase { - ::CORBA::TypeCode_ptr _tc_TdfT = + ::CORBA::TypeCode_ptr const _tc_TdfT = &_tc_TAO_tc_TimeBase_TdfT; } @@ -240,7 +240,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT ( namespace TimeBase { - ::CORBA::TypeCode_ptr _tc_UtcT = + ::CORBA::TypeCode_ptr const _tc_UtcT = &_tc_TAO_tc_TimeBase_UtcT; } @@ -321,7 +321,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT ( namespace TimeBase { - ::CORBA::TypeCode_ptr _tc_IntervalT = + ::CORBA::TypeCode_ptr const _tc_IntervalT = &_tc_TAO_tc_TimeBase_IntervalT; } diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index d86a2aa7cb1..ba100cc4e7f 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -126,7 +126,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index 9f9fbc8c350..e1e49777394 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -81,7 +81,7 @@ namespace TimeBase // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TimeT; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TimeT; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -92,7 +92,7 @@ namespace TimeBase // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InaccuracyT; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_InaccuracyT; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -103,7 +103,7 @@ namespace TimeBase // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TdfT; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TdfT; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -137,7 +137,7 @@ namespace TimeBase // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UtcT; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_UtcT; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -169,7 +169,7 @@ namespace TimeBase // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IntervalT; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IntervalT; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp index c1415e9f01b..92aac0d9895 100644 --- a/TAO/tao/Typecode_typesC.cpp +++ b/TAO/tao/Typecode_typesC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO diff --git a/TAO/tao/ULongLongSeqA.cpp b/TAO/tao/ULongLongSeqA.cpp index 18b0e481b5a..1cb73478413 100644 --- a/TAO/tao/ULongLongSeqA.cpp +++ b/TAO/tao/ULongLongSeqA.cpp @@ -71,7 +71,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ULongLongSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ULongLongSeq = + ::CORBA::TypeCode_ptr const _tc_ULongLongSeq = &_tc_TAO_tc_CORBA_ULongLongSeq; } diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp index c833a113e6d..1def29c5c38 100644 --- a/TAO/tao/ULongLongSeqC.cpp +++ b/TAO/tao/ULongLongSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h index cd37efb8b0f..78e2dc8afdd 100644 --- a/TAO/tao/ULongLongSeqC.h +++ b/TAO/tao/ULongLongSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ULongLongSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ULongLongSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp index dcae28f1e63..1b75f97262e 100644 --- a/TAO/tao/ULongSeqA.cpp +++ b/TAO/tao/ULongSeqA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ULongSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ULongSeq = + ::CORBA::TypeCode_ptr const _tc_ULongSeq = &_tc_TAO_tc_CORBA_ULongSeq; } diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp index 1caefb05c48..deffb84a42c 100644 --- a/TAO/tao/ULongSeqC.cpp +++ b/TAO/tao/ULongSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h index 7de33124933..f9c931dd470 100644 --- a/TAO/tao/ULongSeqC.h +++ b/TAO/tao/ULongSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ULongSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ULongSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp index 9d928bed612..d5923c56744 100644 --- a/TAO/tao/UShortSeqA.cpp +++ b/TAO/tao/UShortSeqA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_UShortSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_UShortSeq = + ::CORBA::TypeCode_ptr const _tc_UShortSeq = &_tc_TAO_tc_CORBA_UShortSeq; } diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp index 8ac40c392b7..a8e30b3b54b 100644 --- a/TAO/tao/UShortSeqC.cpp +++ b/TAO/tao/UShortSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h index d0f5dfe4930..c6f408bfc15 100644 --- a/TAO/tao/UShortSeqC.h +++ b/TAO/tao/UShortSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UShortSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_UShortSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/ValueModifierC.cpp b/TAO/tao/ValueModifierC.cpp index d4d13c2af5e..8bcd9a69752 100644 --- a/TAO/tao/ValueModifierC.cpp +++ b/TAO/tao/ValueModifierC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO diff --git a/TAO/tao/VisibilityC.cpp b/TAO/tao/VisibilityC.cpp index e2d0fa97309..1a1b749e409 100644 --- a/TAO/tao/VisibilityC.cpp +++ b/TAO/tao/VisibilityC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp index bbfb145e7f1..573314d3303 100644 --- a/TAO/tao/WCharSeqA.cpp +++ b/TAO/tao/WCharSeqA.cpp @@ -69,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WCharSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_WCharSeq = + ::CORBA::TypeCode_ptr const _tc_WCharSeq = &_tc_TAO_tc_CORBA_WCharSeq; } diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp index aea40b92298..efaf1cd0caa 100644 --- a/TAO/tao/WCharSeqC.cpp +++ b/TAO/tao/WCharSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h index 7b86ea87b48..64804cae7dd 100644 --- a/TAO/tao/WCharSeqC.h +++ b/TAO/tao/WCharSeqC.h @@ -125,7 +125,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WCharSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_WCharSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp index 0b036df1be0..daf9c8a3f76 100644 --- a/TAO/tao/WStringSeqA.cpp +++ b/TAO/tao/WStringSeqA.cpp @@ -70,7 +70,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_WStringSeq = + ::CORBA::TypeCode_ptr const _tc_WStringSeq = &_tc_TAO_tc_CORBA_WStringSeq; } diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp index 4c977a755c6..d01ae92a9b7 100644 --- a/TAO/tao/WStringSeqC.cpp +++ b/TAO/tao/WStringSeqC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -170,7 +170,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h index 70cb1b57899..b6bfa566d9e 100644 --- a/TAO/tao/WStringSeqC.h +++ b/TAO/tao/WStringSeqC.h @@ -123,7 +123,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_WStringSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 9e4647de406..f1fde0c6388 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -44,7 +44,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -193,7 +193,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_WrongTransaction = + ::CORBA::TypeCode_ptr const _tc_WrongTransaction = &_tc_TAO_tc_CORBA_WrongTransaction; } @@ -218,7 +218,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1509 +// be\be_visitor_root/root.cpp:1619 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index 4090b12287f..e76286449d2 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -117,7 +117,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WrongTransaction; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_WrongTransaction; #endif /* end #if !defined */ diff --git a/TAO/tao/orb_typesA.cpp b/TAO/tao/orb_typesA.cpp index 798d311e29b..08a2f11a7c0 100644 --- a/TAO/tao/orb_typesA.cpp +++ b/TAO/tao/orb_typesA.cpp @@ -61,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ORBid ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_ORBid = + ::CORBA::TypeCode_ptr const _tc_ORBid = &_tc_TAO_tc_CORBA_ORBid; } @@ -96,7 +96,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Flags ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_Flags = + ::CORBA::TypeCode_ptr const _tc_Flags = &_tc_TAO_tc_CORBA_Flags; } @@ -134,7 +134,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Identifier ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_Identifier = + ::CORBA::TypeCode_ptr const _tc_Identifier = &_tc_TAO_tc_CORBA_Identifier; } @@ -173,6 +173,6 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryId ( namespace CORBA { - ::CORBA::TypeCode_ptr _tc_RepositoryId = + ::CORBA::TypeCode_ptr const _tc_RepositoryId = &_tc_TAO_tc_CORBA_RepositoryId; } diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp index afbdd3f6b3e..542b5204bc8 100644 --- a/TAO/tao/orb_typesC.cpp +++ b/TAO/tao/orb_typesC.cpp @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:66 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h index 5c53cd5d373..0506d603484 100644 --- a/TAO/tao/orb_typesC.h +++ b/TAO/tao/orb_typesC.h @@ -81,7 +81,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBid; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORBid; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -92,7 +92,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Flags; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Flags; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:413 @@ -104,7 +104,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Identifier; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Identifier; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:413 @@ -116,7 +116,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryId; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RepositoryId; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 |