diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-04-11 14:56:56 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-04-11 14:56:56 +0000 |
| commit | 5ebec4eb446da34e3b4472184068cf3c9aa5e349 (patch) | |
| tree | 4018e098bca0706166c9d4c48bf3fd695801e31e /TAO/tao/PortableServer | |
| parent | 1c5afc865a724a7a6775d8adf6aeaa8c67b0e369 (diff) | |
| download | ATCD-5ebec4eb446da34e3b4472184068cf3c9aa5e349.tar.gz | |
ChangeLogTag: Mon Apr 11 15:43:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer')
78 files changed, 571 insertions, 1912 deletions
diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl index 7c717798a5b..0fa4dce9ee9 100644 --- a/TAO/tao/PortableServer/AdapterActivator.pidl +++ b/TAO/tao/PortableServer/AdapterActivator.pidl @@ -9,7 +9,7 @@ * AdapaterActivatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -Sci -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp index 831c335e095..c5210a4ef6d 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp @@ -46,7 +46,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_AdapterActivator ( "IDL:omg.org/PortableServer/AdapterActivator:2.3", "AdapterActivator"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_AdapterActivator = @@ -124,20 +124,4 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Impl_T< - PortableServer::AdapterActivator - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::AdapterActivator \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp index a4166fc496a..9dfd6d693f4 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp @@ -90,7 +90,7 @@ PortableServer::AdapterActivator::AdapterActivator (void) PortableServer::AdapterActivator::~AdapterActivator (void) {} -void +void PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer) { AdapterActivator *_tao_tmp_pointer = @@ -108,10 +108,10 @@ PortableServer::AdapterActivator::_narrow ( { return AdapterActivator::_nil (); } - + AdapterActivator_ptr proxy = dynamic_cast<AdapterActivator_ptr> (_tao_objref); - + return AdapterActivator::_duplicate (proxy); } @@ -125,10 +125,10 @@ PortableServer::AdapterActivator::_unchecked_narrow ( { return AdapterActivator::_nil (); } - + AdapterActivator_ptr proxy = dynamic_cast<AdapterActivator_ptr> (_tao_objref); - + return AdapterActivator::_duplicate (proxy); } @@ -139,7 +139,7 @@ PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -189,43 +189,4 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &) return false; } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::AdapterActivator - >; - - template class - TAO_Objref_Var_T< - PortableServer::AdapterActivator - >; - - template class - TAO_Objref_Out_T< - PortableServer::AdapterActivator - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::AdapterActivator \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::AdapterActivator - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::AdapterActivator - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h index 698331b2889..8eb1558e581 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.h +++ b/TAO/tao/PortableServer/AdapterActivatorC.h @@ -177,7 +177,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/ForwardRequest.pidl b/TAO/tao/PortableServer/ForwardRequest.pidl index 6d00db78198..c8df7d7d6a3 100644 --- a/TAO/tao/PortableServer/ForwardRequest.pidl +++ b/TAO/tao/PortableServer/ForwardRequest.pidl @@ -9,7 +9,7 @@ * ForwardRequestC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp index 8710dfd334c..2e485a3c7ce 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.cpp +++ b/TAO/tao/PortableServer/ForwardRequestA.cpp @@ -40,7 +40,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableServer_ForwardRequest[] = { { "forward_reference", &CORBA::_tc_Object } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -53,7 +53,7 @@ static TAO::TypeCode::Struct<char const *, "ForwardRequest", _tao_fields_PortableServer_ForwardRequest, 1); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ForwardRequest = @@ -64,7 +64,7 @@ namespace PortableServer #if (TAO_HAS_MINIMUM_POA == 0) -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -74,12 +74,12 @@ TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::demarshal_value ( ) { CORBA::String_var id; - + if (!(cdr >> id.out ())) { return false; } - + ACE_TRY_NEW_ENV { this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); @@ -90,7 +90,7 @@ TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::demarshal_value ( return false; } ACE_ENDTRY; - + return true; } @@ -149,20 +149,4 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Dual_Impl_T< - PortableServer::ForwardRequest - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::ForwardRequest \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp index 65f29d9b204..eae2d53b284 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.cpp +++ b/TAO/tao/PortableServer/ForwardRequestC.cpp @@ -49,7 +49,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::ForwardRequest::ForwardRequest (void) @@ -133,7 +133,7 @@ void PortableServer::ForwardRequest::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -146,7 +146,7 @@ void PortableServer::ForwardRequest::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -205,13 +205,4 @@ CORBA::Boolean operator>> ( ); } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h index 1f469455629..08f5e51e3b0 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.h +++ b/TAO/tao/PortableServer/ForwardRequestC.h @@ -66,31 +66,31 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_) #define _PORTABLESERVER_FORWARDREQUEST_CH_ - + class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException { public: - + CORBA::Object_var forward_reference; ForwardRequest (void); ForwardRequest (const ForwardRequest &); ~ForwardRequest (void); ForwardRequest &operator= (const ForwardRequest &); - + static void _tao_any_destructor (void *); - + static ForwardRequest *_downcast (CORBA::Exception *); static const ForwardRequest *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -99,28 +99,28 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ctor.cpp:66 - + ForwardRequest ( const CORBA::Object_ptr _tao_forward_reference ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest; #endif /* end #if !defined */ @@ -131,7 +131,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl index ca5610ad755..1159445ce0b 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sci -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp index aae6e8e6de3..dd38d1bd81c 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp @@ -177,29 +177,3 @@ operator>>= ( _tao_elem ); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Basic_Impl_T< - PortableServer::IdAssignmentPolicyValue - >; - - template class - TAO::Any_Impl_T< - PortableServer::IdAssignmentPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - PortableServer::IdAssignmentPolicyValue \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::IdAssignmentPolicy \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp index f0d6927581c..745c1bcec9f 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp @@ -211,42 +211,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdAssignmentPoli return _tao_success; } - -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::IdAssignmentPolicy - >; - - template class - TAO_Objref_Var_T< - PortableServer::IdAssignmentPolicy - >; - - template class - TAO_Objref_Out_T< - PortableServer::IdAssignmentPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::IdAssignmentPolicy \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::IdAssignmentPolicy - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::IdAssignmentPolicy - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h index 57048a38d4d..1773460d112 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h @@ -210,7 +210,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl index 6928a431fe6..110ee6471f0 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp index e1a35f68125..8555bf8a53b 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp @@ -177,29 +177,3 @@ operator>>= ( _tao_elem ); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Basic_Impl_T< - PortableServer::IdUniquenessPolicyValue - >; - - template class - TAO::Any_Impl_T< - PortableServer::IdUniquenessPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - PortableServer::IdUniquenessPolicyValue \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::IdUniquenessPolicy \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp index a647f46bd40..40e6cc5763f 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp @@ -211,42 +211,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdUniquenessPoli return _tao_success; } - -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::IdUniquenessPolicy - >; - - template class - TAO_Objref_Var_T< - PortableServer::IdUniquenessPolicy - >; - - template class - TAO_Objref_Out_T< - PortableServer::IdUniquenessPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::IdUniquenessPolicy \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::IdUniquenessPolicy - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::IdUniquenessPolicy - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h index 8889b3e82c3..936c9f6270a 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h @@ -210,7 +210,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl index 237d5cfedeb..9a5351cac56 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp index 9ea25a152cd..da7bf76f2ef 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp @@ -45,7 +45,7 @@ static char const * const _tao_enumerators_PortableServer_ImplicitActivationPoli { "IMPLICIT_ACTIVATION", "NO_IMPLICIT_ACTIVATION" - + }; static TAO::TypeCode::Enum<char const *, @@ -56,7 +56,7 @@ static TAO::TypeCode::Enum<char const *, "ImplicitActivationPolicyValue", _tao_enumerators_PortableServer_ImplicitActivationPolicyValue, 2); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue = @@ -74,7 +74,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_ImplicitActivationPolicy ( "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3", "ImplicitActivationPolicy"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy = @@ -107,7 +107,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::extract ( _tao_any, PortableServer::_tc_ImplicitActivationPolicyValue, - _tao_elem + _tao_elem ); } @@ -180,30 +180,4 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Basic_Impl_T< - PortableServer::ImplicitActivationPolicyValue - >; - - template class - TAO::Any_Impl_T< - PortableServer::ImplicitActivationPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - PortableServer::ImplicitActivationPolicyValue \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::ImplicitActivationPolicy \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp index 24107157e92..0196e389cfa 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp @@ -90,7 +90,7 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void) PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void) {} -void +void PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer) { ImplicitActivationPolicy *_tao_tmp_pointer = @@ -108,10 +108,10 @@ PortableServer::ImplicitActivationPolicy::_narrow ( { return ImplicitActivationPolicy::_nil (); } - + ImplicitActivationPolicy_ptr proxy = dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref); - + return ImplicitActivationPolicy::_duplicate (proxy); } @@ -125,10 +125,10 @@ PortableServer::ImplicitActivationPolicy::_unchecked_narrow ( { return ImplicitActivationPolicy::_nil (); } - + ImplicitActivationPolicy_ptr proxy = dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref); - + return ImplicitActivationPolicy::_duplicate (proxy); } @@ -139,7 +139,7 @@ PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_p { obj->_add_ref (); } - + return obj; } @@ -205,52 +205,13 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ImplicitActivati { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<PortableServer::ImplicitActivationPolicyValue> (_tao_temp); } - + return _tao_success; } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::ImplicitActivationPolicy - >; - - template class - TAO_Objref_Var_T< - PortableServer::ImplicitActivationPolicy - >; - - template class - TAO_Objref_Out_T< - PortableServer::ImplicitActivationPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::ImplicitActivationPolicy \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::ImplicitActivationPolicy - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::ImplicitActivationPolicy - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h index f32c6096541..15ca233daa4 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h @@ -68,39 +68,39 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum ImplicitActivationPolicyValue { IMPLICIT_ACTIVATION, NO_IMPLICIT_ACTIVATION }; - + #if (TAO_HAS_MINIMUM_POA == 0) typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__VAR_OUT_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__VAR_OUT_CH_ - + class ImplicitActivationPolicy; typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr; - + typedef TAO_Objref_Var_T< ImplicitActivationPolicy > ImplicitActivationPolicy_var; - + typedef TAO_Objref_Out_T< ImplicitActivationPolicy @@ -108,120 +108,121 @@ namespace PortableServer ImplicitActivationPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_ - + class TAO_PortableServer_Export ImplicitActivationPolicy : public virtual ::CORBA::Policy { public: typedef ImplicitActivationPolicy_ptr _ptr_type; typedef ImplicitActivationPolicy_var _var_type; - + // 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 ); - + static ImplicitActivationPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ImplicitActivationPolicy_ptr _nil (void) { return static_cast<ImplicitActivationPolicy_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::ImplicitActivationPolicyValue value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ImplicitActivationPolicy (void); - + virtual ~ImplicitActivationPolicy (void); - + private: // Private and unimplemented for concrete interfaces. ImplicitActivationPolicy (const ImplicitActivationPolicy &); - + void operator= (const ImplicitActivationPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 -#if (TAO_HAS_MINIMUM_POA == 0) // Traits specializations. namespace TAO { +#if (TAO_HAS_MINIMUM_POA == 0) #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_ - + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ImplicitActivationPolicy> { @@ -239,11 +240,15 @@ namespace TAO }; #endif /* end #if !defined */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ } // TAO_IDL - Generated from // be\be_visitor_enum/any_op_ch.cpp:51 +#if (TAO_HAS_MINIMUM_POA == 0) + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); diff --git a/TAO/tao/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl index 197c620e1e1..428503d0157 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.pidl +++ b/TAO/tao/PortableServer/LifespanPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -Sci -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp index f5c68819de1..9c16463b26c 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp @@ -177,29 +177,3 @@ operator>>= ( _tao_elem ); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Basic_Impl_T< - PortableServer::LifespanPolicyValue - >; - - template class - TAO::Any_Impl_T< - PortableServer::LifespanPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - PortableServer::LifespanPolicyValue \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::LifespanPolicy \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp index e2b9c4a303d..abd81f5c1da 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp @@ -211,42 +211,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::LifespanPolicyVa return _tao_success; } - -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::LifespanPolicy - >; - - template class - TAO_Objref_Var_T< - PortableServer::LifespanPolicy - >; - - template class - TAO_Objref_Out_T< - PortableServer::LifespanPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::LifespanPolicy \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::LifespanPolicy - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::LifespanPolicy - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h index cfe619eaabe..b3eb4d69ed9 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.h +++ b/TAO/tao/PortableServer/LifespanPolicyC.h @@ -210,7 +210,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/POAManager.pidl b/TAO/tao/PortableServer/POAManager.pidl index 1b8091f3066..6c9f72580be 100644 --- a/TAO/tao/PortableServer/POAManager.pidl +++ b/TAO/tao/PortableServer/POAManager.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp index db4804e820a..f6ed5d440d8 100644 --- a/TAO/tao/PortableServer/POAManagerA.cpp +++ b/TAO/tao/PortableServer/POAManagerA.cpp @@ -281,39 +281,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POAManager::AdapterInactive - >; - - template class - TAO::Any_Basic_Impl_T< - PortableServer::POAManager::State - >; - - template class - TAO::Any_Impl_T< - PortableServer::POAManager - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POAManager::AdapterInactive \ - > - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - PortableServer::POAManager::State \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::POAManager \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp index ad89592a905..670181ce65c 100644 --- a/TAO/tao/PortableServer/POAManagerC.cpp +++ b/TAO/tao/PortableServer/POAManagerC.cpp @@ -281,42 +281,3 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &) { return false; } - -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::POAManager - >; - - template class - TAO_Objref_Var_T< - PortableServer::POAManager - >; - - template class - TAO_Objref_Out_T< - PortableServer::POAManager - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::POAManager \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::POAManager - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::POAManager - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h index 5bec8338a54..52606904b70 100644 --- a/TAO/tao/PortableServer/POAManagerC.h +++ b/TAO/tao/PortableServer/POAManagerC.h @@ -292,7 +292,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl index b82753dd59d..a1b7ab68b61 100644 --- a/TAO/tao/PortableServer/PS_Current.pidl +++ b/TAO/tao/PortableServer/PS_Current.pidl @@ -9,7 +9,7 @@ * PS_CurrentC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sci -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp index f004700f29a..42462d36bbc 100644 --- a/TAO/tao/PortableServer/PS_CurrentA.cpp +++ b/TAO/tao/PortableServer/PS_CurrentA.cpp @@ -213,29 +213,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Dual_Impl_T< - PortableServer::Current::NoContext - >; - - template class - TAO::Any_Impl_T< - PortableServer::Current - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::Current::NoContext \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::Current \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp index 86baf974afa..cf2095eef69 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.cpp +++ b/TAO/tao/PortableServer/PS_CurrentC.cpp @@ -285,42 +285,3 @@ PortableServer::Current::marshal (TAO_OutputCDR &) { return false; } - -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::Current - >; - - template class - TAO_Objref_Var_T< - PortableServer::Current - >; - - template class - TAO_Objref_Out_T< - PortableServer::Current - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::Current \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::Current - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::Current - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h index 2a40f6ea5ac..f4e40c3f543 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.h +++ b/TAO/tao/PortableServer/PS_CurrentC.h @@ -248,7 +248,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl index 0566bd68018..86f8af6f927 100644 --- a/TAO/tao/PortableServer/PS_Forward.pidl +++ b/TAO/tao/PortableServer/PS_Forward.pidl @@ -9,7 +9,7 @@ * PS_ForwardC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp index c924bba740c..e16dc70e71b 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.cpp +++ b/TAO/tao/PortableServer/PS_ForwardA.cpp @@ -51,9 +51,3 @@ namespace PortableServer } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp index c73fff57d48..52b1831cc27 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.cpp +++ b/TAO/tao/PortableServer/PS_ForwardC.cpp @@ -45,12 +45,3 @@ namespace TAO { } - -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index 9e39b774fe4..f9df9f862e0 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -122,7 +122,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl index 2e1ba2989dd..fd221867830 100644 --- a/TAO/tao/PortableServer/PortableServer.pidl +++ b/TAO/tao/PortableServer/PortableServer.pidl @@ -9,7 +9,7 @@ * PortableServerC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Sci -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Sci -Gp -Gd -Ge 1 -Sc -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp index e0eb2c3ab56..5c3465dfd59 100644 --- a/TAO/tao/PortableServer/PortableServerA.cpp +++ b/TAO/tao/PortableServer/PortableServerA.cpp @@ -58,16 +58,16 @@ namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> PortableServer_POAList_0 ( CORBA::tk_sequence, &PortableServer::_tc_POA, 0U); - + ::CORBA::TypeCode_ptr const tc_PortableServer_POAList_0 = &PortableServer_POAList_0; - + } } @@ -81,7 +81,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/PortableServer/POAList:1.0", "POAList", &TAO::TypeCode::tc_PortableServer_POAList_0); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_POAList = @@ -105,7 +105,7 @@ static TAO::TypeCode::Struct<char const *, "AdapterAlreadyExists", _tao_fields_PortableServer_POA_AdapterAlreadyExists, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterAlreadyExists = &_tao_tc_PortableServer_POA_AdapterAlreadyExists; @@ -124,7 +124,7 @@ static TAO::TypeCode::Struct<char const *, "AdapterNonExistent", _tao_fields_PortableServer_POA_AdapterNonExistent, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterNonExistent = &_tao_tc_PortableServer_POA_AdapterNonExistent; @@ -134,7 +134,7 @@ static TAO::TypeCode::Struct<char const *, static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableServer_POA_InvalidPolicy[] = { { "index", &CORBA::_tc_ushort } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -147,7 +147,7 @@ static TAO::TypeCode::Struct<char const *, "InvalidPolicy", _tao_fields_PortableServer_POA_InvalidPolicy, 1); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_InvalidPolicy = &_tao_tc_PortableServer_POA_InvalidPolicy; @@ -168,7 +168,7 @@ static TAO::TypeCode::Struct<char const *, "NoServant", _tao_fields_PortableServer_POA_NoServant, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant = &_tao_tc_PortableServer_POA_NoServant; @@ -189,7 +189,7 @@ static TAO::TypeCode::Struct<char const *, "ObjectAlreadyActive", _tao_fields_PortableServer_POA_ObjectAlreadyActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectAlreadyActive = &_tao_tc_PortableServer_POA_ObjectAlreadyActive; @@ -208,7 +208,7 @@ static TAO::TypeCode::Struct<char const *, "ObjectNotActive", _tao_fields_PortableServer_POA_ObjectNotActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectNotActive = &_tao_tc_PortableServer_POA_ObjectNotActive; @@ -227,7 +227,7 @@ static TAO::TypeCode::Struct<char const *, "ServantAlreadyActive", _tao_fields_PortableServer_POA_ServantAlreadyActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantAlreadyActive = &_tao_tc_PortableServer_POA_ServantAlreadyActive; @@ -246,7 +246,7 @@ static TAO::TypeCode::Struct<char const *, "ServantNotActive", _tao_fields_PortableServer_POA_ServantNotActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantNotActive = &_tao_tc_PortableServer_POA_ServantNotActive; @@ -265,7 +265,7 @@ static TAO::TypeCode::Struct<char const *, "WrongAdapter", _tao_fields_PortableServer_POA_WrongAdapter, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongAdapter = &_tao_tc_PortableServer_POA_WrongAdapter; @@ -284,7 +284,7 @@ static TAO::TypeCode::Struct<char const *, "WrongPolicy", _tao_fields_PortableServer_POA_WrongPolicy, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongPolicy = &_tao_tc_PortableServer_POA_WrongPolicy; @@ -297,7 +297,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_POA ( "IDL:omg.org/PortableServer/POA:2.3", "POA"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_POA = @@ -306,7 +306,7 @@ namespace PortableServer -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -447,7 +447,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -519,7 +519,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -591,7 +591,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -663,7 +663,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 #if (TAO_HAS_MINIMUM_POA == 0) @@ -739,7 +739,7 @@ CORBA::Boolean operator>>= ( #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -811,7 +811,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -883,7 +883,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -955,7 +955,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -1027,7 +1027,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -1099,7 +1099,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 template<> @@ -1170,137 +1170,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::AdapterAlreadyExists - >; - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::AdapterNonExistent - >; - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::InvalidPolicy - >; - -#if (TAO_HAS_MINIMUM_POA == 0) - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::NoServant - >; - -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::ObjectAlreadyActive - >; - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::ObjectNotActive - >; - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::ServantAlreadyActive - >; - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::ServantNotActive - >; - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::WrongAdapter - >; - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::WrongPolicy - >; - - template class - TAO::Any_Impl_T< - PortableServer::POA - >; - - template class - TAO::Any_Dual_Impl_T< - PortableServer::POAList - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::AdapterAlreadyExists \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::AdapterNonExistent \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::InvalidPolicy \ - > - -#if (TAO_HAS_MINIMUM_POA == 0) - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::NoServant \ - > - -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::ObjectAlreadyActive \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::ObjectNotActive \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::ServantAlreadyActive \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::ServantNotActive \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::WrongAdapter \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::WrongPolicy \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::POA \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POAList \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 151c0d5c816..3dadf552aba 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -1231,162 +1231,3 @@ PortableServer::POA::marshal (TAO_OutputCDR &) { return false; } - -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::POA - >; - - template class - TAO_Objref_Var_T< - PortableServer::POA - >; - - template class - TAO_Objref_Out_T< - PortableServer::POA - >; - - template class - TAO_Object_Manager< - PortableServer::POA, - PortableServer::POA_var - >; - - template class - TAO_MngSeq_Var_T< - PortableServer::POAList, - TAO_Object_Manager< - PortableServer::POA, - PortableServer::POA_var - > - >; - - template class - TAO_Seq_Var_Base_T< - PortableServer::POAList, - TAO_Object_Manager< - PortableServer::POA, - PortableServer::POA_var - > - >; - - template class - TAO_MngSeq_Out_T< - PortableServer::POAList, - PortableServer::POAList_var, - TAO_Object_Manager< - PortableServer::POA, - PortableServer::POA_var - > - >; - -#if !defined (_PORTABLESERVER_POA__EXPLICIT_CS_) -#define _PORTABLESERVER_POA__EXPLICIT_CS_ - - template class - TAO_Unbounded_Object_Sequence< - PortableServer::POA, - PortableServer::POA_var - >; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_ - - template class - TAO::Arg_Traits< - PortableServer::AdapterActivator - >; - - template class - TAO::Object_Arg_Traits_T< - PortableServer::AdapterActivator_ptr, - PortableServer::AdapterActivator_var, - PortableServer::AdapterActivator_out, - TAO::Objref_Traits<PortableServer::AdapterActivator> - >; - -#endif /* end #if !defined */ - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::POA \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::POA - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::POA - > - -# pragma instantiate \ - TAO_MngSeq_Var_T< \ - PortableServer::POAList, \ - TAO_Object_Manager< \ - PortableServer::POA, \ - PortableServer::POA_var \ - > \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - PortableServer::POAList, \ - TAO_Object_Manager< \ - PortableServer::POA, \ - PortableServer::POA_var \ - > \ - > - -# pragma instantiate \ - TAO_MngSeq_Out_T< \ - PortableServer::POAList, \ - PortableServer::POAList_var, \ - TAO_Object_Manager< \ - PortableServer::POA, \ - PortableServer::POA_var \ - > \ - > - -#if !defined (_PORTABLESERVER_POA__EXPLICIT_CS_) -#define _PORTABLESERVER_POA__EXPLICIT_CS_ - -# pragma instantiate \ - TAO_Unbounded_Object_Sequence< \ - PortableServer::POA, \ - PortableServer::POA_var \ - > - -#endif /* end #if !defined */ - -#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate \ - TAO::Arg_Traits< \ - PortableServer::AdapterActivator \ - > - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - PortableServer::AdapterActivator_ptr, \ - PortableServer::AdapterActivator_var, \ - PortableServer::AdapterActivator_out, \ - TAO::Objref_Traits<PortableServer::AdapterActivator> \ - > - -#endif /* end #if !defined */ - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 1ea08c1b11e..8e467e7b38b 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -1253,7 +1253,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h index 3bb0f4258ac..38649c85687 100644 --- a/TAO/tao/PortableServer/PortableServer_includeC.h +++ b/TAO/tao/PortableServer/PortableServer_includeC.h @@ -62,7 +62,7 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl index 4799aafc996..7c8d7ac787b 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp index b565c1c14ef..d7f54471b46 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp @@ -46,7 +46,7 @@ static char const * const _tao_enumerators_PortableServer_RequestProcessingPolic "USE_ACTIVE_OBJECT_MAP_ONLY", "USE_DEFAULT_SERVANT", "USE_SERVANT_MANAGER" - + }; static TAO::TypeCode::Enum<char const *, @@ -57,7 +57,7 @@ static TAO::TypeCode::Enum<char const *, "RequestProcessingPolicyValue", _tao_enumerators_PortableServer_RequestProcessingPolicyValue, 3); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue = @@ -75,7 +75,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_RequestProcessingPolicy ( "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3", "RequestProcessingPolicy"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy = @@ -108,7 +108,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract ( _tao_any, PortableServer::_tc_RequestProcessingPolicyValue, - _tao_elem + _tao_elem ); } @@ -181,30 +181,4 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Basic_Impl_T< - PortableServer::RequestProcessingPolicyValue - >; - - template class - TAO::Any_Impl_T< - PortableServer::RequestProcessingPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - PortableServer::RequestProcessingPolicyValue \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::RequestProcessingPolicy \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp index 5c14742ca0d..868b77bc8e8 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp @@ -90,7 +90,7 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void) PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void) {} -void +void PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer) { RequestProcessingPolicy *_tao_tmp_pointer = @@ -108,10 +108,10 @@ PortableServer::RequestProcessingPolicy::_narrow ( { return RequestProcessingPolicy::_nil (); } - + RequestProcessingPolicy_ptr proxy = dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref); - + return RequestProcessingPolicy::_duplicate (proxy); } @@ -125,10 +125,10 @@ PortableServer::RequestProcessingPolicy::_unchecked_narrow ( { return RequestProcessingPolicy::_nil (); } - + RequestProcessingPolicy_ptr proxy = dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref); - + return RequestProcessingPolicy::_duplicate (proxy); } @@ -139,7 +139,7 @@ PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr { obj->_add_ref (); } - + return obj; } @@ -205,52 +205,13 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::RequestProcessin { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<PortableServer::RequestProcessingPolicyValue> (_tao_temp); } - + return _tao_success; } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::RequestProcessingPolicy - >; - - template class - TAO_Objref_Var_T< - PortableServer::RequestProcessingPolicy - >; - - template class - TAO_Objref_Out_T< - PortableServer::RequestProcessingPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::RequestProcessingPolicy \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::RequestProcessingPolicy - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::RequestProcessingPolicy - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h index 49ac5003af9..33e368ad015 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h @@ -68,40 +68,40 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum RequestProcessingPolicyValue { USE_ACTIVE_OBJECT_MAP_ONLY, USE_DEFAULT_SERVANT, USE_SERVANT_MANAGER }; - + #if (TAO_HAS_MINIMUM_POA == 0) typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_ - + class RequestProcessingPolicy; typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr; - + typedef TAO_Objref_Var_T< RequestProcessingPolicy > RequestProcessingPolicy_var; - + typedef TAO_Objref_Out_T< RequestProcessingPolicy @@ -109,120 +109,121 @@ namespace PortableServer RequestProcessingPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_ - + class TAO_PortableServer_Export RequestProcessingPolicy : public virtual ::CORBA::Policy { public: typedef RequestProcessingPolicy_ptr _ptr_type; typedef RequestProcessingPolicy_var _var_type; - + // 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 ); - + static RequestProcessingPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RequestProcessingPolicy_ptr _nil (void) { return static_cast<RequestProcessingPolicy_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::RequestProcessingPolicyValue value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. RequestProcessingPolicy (void); - + virtual ~RequestProcessingPolicy (void); - + private: // Private and unimplemented for concrete interfaces. RequestProcessingPolicy (const RequestProcessingPolicy &); - + void operator= (const RequestProcessingPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 -#if (TAO_HAS_MINIMUM_POA == 0) // Traits specializations. namespace TAO { +#if (TAO_HAS_MINIMUM_POA == 0) + #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_ - + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::RequestProcessingPolicy> { @@ -240,11 +241,16 @@ namespace TAO }; #endif /* end #if !defined */ + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + } // TAO_IDL - Generated from // be\be_visitor_enum/any_op_ch.cpp:51 +#if (TAO_HAS_MINIMUM_POA == 0) + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); @@ -261,7 +267,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &); -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ // TAO_IDL - Generated from // be\be_codegen.cpp:955 diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl index 028743592b2..b51f5be5e2e 100644 --- a/TAO/tao/PortableServer/ServantActivator.pidl +++ b/TAO/tao/PortableServer/ServantActivator.pidl @@ -9,7 +9,7 @@ * ServantActivatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp index 2a98822a191..eedc1081b5a 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.cpp +++ b/TAO/tao/PortableServer/ServantActivatorA.cpp @@ -45,7 +45,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_ServantActivator ( "IDL:omg.org/PortableServer/ServantActivator:2.3", "ServantActivator"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ServantActivator = @@ -123,20 +123,4 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Impl_T< - PortableServer::ServantActivator - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::ServantActivator \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp index 21dd2699adc..8decf45fb33 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.cpp +++ b/TAO/tao/PortableServer/ServantActivatorC.cpp @@ -91,7 +91,7 @@ PortableServer::ServantActivator::ServantActivator (void) PortableServer::ServantActivator::~ServantActivator (void) {} -void +void PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer) { ServantActivator *_tao_tmp_pointer = @@ -109,10 +109,10 @@ PortableServer::ServantActivator::_narrow ( { return ServantActivator::_nil (); } - + ServantActivator_ptr proxy = dynamic_cast<ServantActivator_ptr> (_tao_objref); - + return ServantActivator::_duplicate (proxy); } @@ -126,10 +126,10 @@ PortableServer::ServantActivator::_unchecked_narrow ( { return ServantActivator::_nil (); } - + ServantActivator_ptr proxy = dynamic_cast<ServantActivator_ptr> (_tao_objref); - + return ServantActivator::_duplicate (proxy); } @@ -140,7 +140,7 @@ PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -194,43 +194,4 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &) return false; } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::ServantActivator - >; - - template class - TAO_Objref_Var_T< - PortableServer::ServantActivator - >; - - template class - TAO_Objref_Out_T< - PortableServer::ServantActivator - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::ServantActivator \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::ServantActivator - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::ServantActivator - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h index d47c4675aa1..64de4071d28 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.h +++ b/TAO/tao/PortableServer/ServantActivatorC.h @@ -196,7 +196,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl index bebc3df1d21..333fea55271 100644 --- a/TAO/tao/PortableServer/ServantLocator.pidl +++ b/TAO/tao/PortableServer/ServantLocator.pidl @@ -9,7 +9,7 @@ * ServantLocatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp index 47f4da53a51..2fed2c97d5d 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.cpp +++ b/TAO/tao/PortableServer/ServantLocatorA.cpp @@ -46,7 +46,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_ServantLocator ( "IDL:omg.org/PortableServer/ServantLocator:2.3", "ServantLocator"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ServantLocator = @@ -124,20 +124,4 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Impl_T< - PortableServer::ServantLocator - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::ServantLocator \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp index 63ad8460583..6db6c39edda 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.cpp +++ b/TAO/tao/PortableServer/ServantLocatorC.cpp @@ -91,7 +91,7 @@ PortableServer::ServantLocator::ServantLocator (void) PortableServer::ServantLocator::~ServantLocator (void) {} -void +void PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer) { ServantLocator *_tao_tmp_pointer = @@ -109,10 +109,10 @@ PortableServer::ServantLocator::_narrow ( { return ServantLocator::_nil (); } - + ServantLocator_ptr proxy = dynamic_cast<ServantLocator_ptr> (_tao_objref); - + return ServantLocator::_duplicate (proxy); } @@ -126,10 +126,10 @@ PortableServer::ServantLocator::_unchecked_narrow ( { return ServantLocator::_nil (); } - + ServantLocator_ptr proxy = dynamic_cast<ServantLocator_ptr> (_tao_objref); - + return ServantLocator::_duplicate (proxy); } @@ -140,7 +140,7 @@ PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -194,43 +194,4 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &) return false; } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::ServantLocator - >; - - template class - TAO_Objref_Var_T< - PortableServer::ServantLocator - >; - - template class - TAO_Objref_Out_T< - PortableServer::ServantLocator - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::ServantLocator \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::ServantLocator - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::ServantLocator - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index cd1c1704b4f..be2020ff060 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -201,7 +201,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/ServantManager.pidl b/TAO/tao/PortableServer/ServantManager.pidl index 6056fe5b83a..dd2495559e0 100644 --- a/TAO/tao/PortableServer/ServantManager.pidl +++ b/TAO/tao/PortableServer/ServantManager.pidl @@ -9,7 +9,7 @@ * ServantManagerC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp index 4e61157c6bb..8820506633b 100644 --- a/TAO/tao/PortableServer/ServantManagerA.cpp +++ b/TAO/tao/PortableServer/ServantManagerA.cpp @@ -45,7 +45,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_ServantManager ( "IDL:omg.org/PortableServer/ServantManager:2.3", "ServantManager"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ServantManager = @@ -123,20 +123,4 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Impl_T< - PortableServer::ServantManager - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::ServantManager \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp index 30d185091c2..faddb9b6a0a 100644 --- a/TAO/tao/PortableServer/ServantManagerC.cpp +++ b/TAO/tao/PortableServer/ServantManagerC.cpp @@ -89,7 +89,7 @@ PortableServer::ServantManager::ServantManager (void) PortableServer::ServantManager::~ServantManager (void) {} -void +void PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer) { ServantManager *_tao_tmp_pointer = @@ -107,10 +107,10 @@ PortableServer::ServantManager::_narrow ( { return ServantManager::_nil (); } - + ServantManager_ptr proxy = dynamic_cast<ServantManager_ptr> (_tao_objref); - + return ServantManager::_duplicate (proxy); } @@ -124,10 +124,10 @@ PortableServer::ServantManager::_unchecked_narrow ( { return ServantManager::_nil (); } - + ServantManager_ptr proxy = dynamic_cast<ServantManager_ptr> (_tao_objref); - + return ServantManager::_duplicate (proxy); } @@ -138,7 +138,7 @@ PortableServer::ServantManager::_duplicate (ServantManager_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -188,43 +188,4 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &) return false; } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::ServantManager - >; - - template class - TAO_Objref_Var_T< - PortableServer::ServantManager - >; - - template class - TAO_Objref_Out_T< - PortableServer::ServantManager - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::ServantManager \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::ServantManager - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::ServantManager - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h index 24fffffca38..564ed3ac737 100644 --- a/TAO/tao/PortableServer/ServantManagerC.h +++ b/TAO/tao/PortableServer/ServantManagerC.h @@ -163,7 +163,7 @@ namespace PortableServer } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl index 66d9e9c0f43..fefc5b0efb5 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp index 721ba8afe6a..9133d9f7613 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp @@ -45,7 +45,7 @@ static char const * const _tao_enumerators_PortableServer_ServantRetentionPolicy { "RETAIN", "NON_RETAIN" - + }; static TAO::TypeCode::Enum<char const *, @@ -56,7 +56,7 @@ static TAO::TypeCode::Enum<char const *, "ServantRetentionPolicyValue", _tao_enumerators_PortableServer_ServantRetentionPolicyValue, 2); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue = @@ -74,7 +74,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_ServantRetentionPolicy ( "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3", "ServantRetentionPolicy"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy = @@ -107,7 +107,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::extract ( _tao_any, PortableServer::_tc_ServantRetentionPolicyValue, - _tao_elem + _tao_elem ); } @@ -180,30 +180,4 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Basic_Impl_T< - PortableServer::ServantRetentionPolicyValue - >; - - template class - TAO::Any_Impl_T< - PortableServer::ServantRetentionPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - PortableServer::ServantRetentionPolicyValue \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::ServantRetentionPolicy \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp index 7b34a88cb84..42c74a9c2b5 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp @@ -90,7 +90,7 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void) PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void) {} -void +void PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer) { ServantRetentionPolicy *_tao_tmp_pointer = @@ -108,10 +108,10 @@ PortableServer::ServantRetentionPolicy::_narrow ( { return ServantRetentionPolicy::_nil (); } - + ServantRetentionPolicy_ptr proxy = dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref); - + return ServantRetentionPolicy::_duplicate (proxy); } @@ -125,10 +125,10 @@ PortableServer::ServantRetentionPolicy::_unchecked_narrow ( { return ServantRetentionPolicy::_nil (); } - + ServantRetentionPolicy_ptr proxy = dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref); - + return ServantRetentionPolicy::_duplicate (proxy); } @@ -139,7 +139,7 @@ PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr o { obj->_add_ref (); } - + return obj; } @@ -205,52 +205,13 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ServantRetention { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<PortableServer::ServantRetentionPolicyValue> (_tao_temp); } - + return _tao_success; } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::ServantRetentionPolicy - >; - - template class - TAO_Objref_Var_T< - PortableServer::ServantRetentionPolicy - >; - - template class - TAO_Objref_Out_T< - PortableServer::ServantRetentionPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::ServantRetentionPolicy \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::ServantRetentionPolicy - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::ServantRetentionPolicy - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h index fdb4f205954..04267dc9708 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h @@ -68,39 +68,39 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum ServantRetentionPolicyValue { RETAIN, NON_RETAIN }; - + #if (TAO_HAS_MINIMUM_POA == 0) typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_ - + class ServantRetentionPolicy; typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr; - + typedef TAO_Objref_Var_T< ServantRetentionPolicy > ServantRetentionPolicy_var; - + typedef TAO_Objref_Out_T< ServantRetentionPolicy @@ -108,120 +108,122 @@ namespace PortableServer ServantRetentionPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_ - + class TAO_PortableServer_Export ServantRetentionPolicy : public virtual ::CORBA::Policy { public: typedef ServantRetentionPolicy_ptr _ptr_type; typedef ServantRetentionPolicy_var _var_type; - + // 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 ); - + static ServantRetentionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServantRetentionPolicy_ptr _nil (void) { return static_cast<ServantRetentionPolicy_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::ServantRetentionPolicyValue value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ServantRetentionPolicy (void); - + virtual ~ServantRetentionPolicy (void); - + private: // Private and unimplemented for concrete interfaces. ServantRetentionPolicy (const ServantRetentionPolicy &); - + void operator= (const ServantRetentionPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 -#if (TAO_HAS_MINIMUM_POA == 0) // Traits specializations. namespace TAO { +#if (TAO_HAS_MINIMUM_POA == 0) + #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_ - + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantRetentionPolicy> { @@ -239,11 +241,15 @@ namespace TAO }; #endif /* end #if !defined */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ } // TAO_IDL - Generated from // be\be_visitor_enum/any_op_ch.cpp:51 +#if (TAO_HAS_MINIMUM_POA == 0) + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &); diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl index 480be1332b5..a86084a88b5 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.pidl +++ b/TAO/tao/PortableServer/ThreadPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp index 97db8a79b28..229443fd911 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp @@ -45,7 +45,7 @@ static char const * const _tao_enumerators_PortableServer_ThreadPolicyValue[] = { "ORB_CTRL_MODEL", "SINGLE_THREAD_MODEL" - + }; static TAO::TypeCode::Enum<char const *, @@ -56,7 +56,7 @@ static TAO::TypeCode::Enum<char const *, "ThreadPolicyValue", _tao_enumerators_PortableServer_ThreadPolicyValue, 2); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue = @@ -74,7 +74,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_ThreadPolicy ( "IDL:omg.org/PortableServer/ThreadPolicy:2.3", "ThreadPolicy"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ThreadPolicy = @@ -107,7 +107,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::extract ( _tao_any, PortableServer::_tc_ThreadPolicyValue, - _tao_elem + _tao_elem ); } @@ -180,30 +180,4 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Basic_Impl_T< - PortableServer::ThreadPolicyValue - >; - - template class - TAO::Any_Impl_T< - PortableServer::ThreadPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - PortableServer::ThreadPolicyValue \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - PortableServer::ThreadPolicy \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp index 26517d1e4ac..5c89371a015 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp @@ -90,7 +90,7 @@ PortableServer::ThreadPolicy::ThreadPolicy (void) PortableServer::ThreadPolicy::~ThreadPolicy (void) {} -void +void PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer) { ThreadPolicy *_tao_tmp_pointer = @@ -108,10 +108,10 @@ PortableServer::ThreadPolicy::_narrow ( { return ThreadPolicy::_nil (); } - + ThreadPolicy_ptr proxy = dynamic_cast<ThreadPolicy_ptr> (_tao_objref); - + return ThreadPolicy::_duplicate (proxy); } @@ -125,10 +125,10 @@ PortableServer::ThreadPolicy::_unchecked_narrow ( { return ThreadPolicy::_nil (); } - + ThreadPolicy_ptr proxy = dynamic_cast<ThreadPolicy_ptr> (_tao_objref); - + return ThreadPolicy::_duplicate (proxy); } @@ -139,7 +139,7 @@ PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -205,52 +205,13 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ThreadPolicyValu { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<PortableServer::ThreadPolicyValue> (_tao_temp); } - + return _tao_success; } -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1528 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Objref_Traits< - PortableServer::ThreadPolicy - >; - - template class - TAO_Objref_Var_T< - PortableServer::ThreadPolicy - >; - - template class - TAO_Objref_Out_T< - PortableServer::ThreadPolicy - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableServer::ThreadPolicy \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableServer::ThreadPolicy - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableServer::ThreadPolicy - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h index 4d07eafd5c0..083c0a53a19 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.h +++ b/TAO/tao/PortableServer/ThreadPolicyC.h @@ -68,39 +68,39 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum ThreadPolicyValue { ORB_CTRL_MODEL, SINGLE_THREAD_MODEL }; - + #if (TAO_HAS_MINIMUM_POA == 0) typedef ThreadPolicyValue &ThreadPolicyValue_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_) #define _PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_ - + class ThreadPolicy; typedef ThreadPolicy *ThreadPolicy_ptr; - + typedef TAO_Objref_Var_T< ThreadPolicy > ThreadPolicy_var; - + typedef TAO_Objref_Out_T< ThreadPolicy @@ -108,120 +108,122 @@ namespace PortableServer ThreadPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_) #define _PORTABLESERVER_THREADPOLICY_CH_ - + class TAO_PortableServer_Export ThreadPolicy : public virtual ::CORBA::Policy { public: typedef ThreadPolicy_ptr _ptr_type; typedef ThreadPolicy_var _var_type; - + // 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 ); - + static ThreadPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ThreadPolicy_ptr _nil (void) { return static_cast<ThreadPolicy_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::ThreadPolicyValue value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ThreadPolicy (void); - + virtual ~ThreadPolicy (void); - + private: // Private and unimplemented for concrete interfaces. ThreadPolicy (const ThreadPolicy &); - + void operator= (const ThreadPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ } // module PortableServer // TAO_IDL - Generated from -// be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:61 // Traits specializations. -#if (TAO_HAS_MINIMUM_POA == 0) namespace TAO { +#if (TAO_HAS_MINIMUM_POA == 0) + #if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_) #define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_ - + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ThreadPolicy> { @@ -239,11 +241,16 @@ namespace TAO }; #endif /* end #if !defined */ + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + } // TAO_IDL - Generated from // be\be_visitor_enum/any_op_ch.cpp:51 +#if (TAO_HAS_MINIMUM_POA == 0) + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &); diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff index a257d871826..cb97401f33c 100644 --- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff +++ b/TAO/tao/PortableServer/diffs/AdapterActivator.diff @@ -1,13 +1,5 @@ ---- orig/AdapterActivatorC.h 2005-04-08 09:05:05.635929600 +0200 -+++ AdapterActivatorC.h 2005-04-08 09:12:54.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/AdapterActivatorC.h 2005-04-11 16:43:59.830620800 +0200 ++++ AdapterActivatorC.h 2005-04-11 16:44:03.676150400 +0200 @@ -66,9 +66,10 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -29,16 +21,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:955 ---- orig/AdapterActivatorC.cpp 2005-04-08 09:05:05.635929600 +0200 -+++ AdapterActivatorC.cpp 2005-04-08 09:12:54.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/AdapterActivatorC.cpp 2005-04-11 16:43:59.830620800 +0200 ++++ AdapterActivatorC.cpp 2005-04-11 16:44:31.986859200 +0200 @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -48,22 +32,14 @@ // Arg traits specializations. namespace TAO { -@@ -225,3 +227,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -186,3 +188,5 @@ + { + return false; + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/AdapterActivatorA.cpp 2005-04-08 09:05:05.635929600 +0200 -+++ AdapterActivatorA.cpp 2005-04-08 09:12:54.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/AdapterActivatorA.cpp 2005-04-11 16:43:59.830620800 +0200 ++++ AdapterActivatorA.cpp 2005-04-11 16:44:25.647744000 +0200 @@ -35,6 +35,8 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" @@ -73,9 +49,9 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 -@@ -137,3 +139,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -121,3 +123,5 @@ + _tao_elem + ); + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff index 8e4b870137f..cd868c7cea6 100644 --- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff +++ b/TAO/tao/PortableServer/diffs/ForwardRequest.diff @@ -1,13 +1,5 @@ ---- orig/ForwardRequestC.h 2005-04-08 09:05:08.990753600 +0200 -+++ ForwardRequestC.h 2005-04-08 09:12:54.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ForwardRequestC.h 2005-04-11 16:44:02.454393600 +0200 ++++ ForwardRequestC.h 2005-04-11 16:44:04.937964800 +0200 @@ -59,6 +59,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ @@ -26,16 +18,8 @@ #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ ---- orig/ForwardRequestC.cpp 2005-04-08 09:05:08.990753600 +0200 -+++ ForwardRequestC.cpp 2005-04-08 09:12:54.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ForwardRequestC.cpp 2005-04-11 16:44:02.454393600 +0200 ++++ ForwardRequestC.cpp 2005-04-11 16:44:51.324665600 +0200 @@ -38,6 +38,8 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ @@ -45,22 +29,14 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -@@ -211,3 +213,5 @@ - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -202,3 +204,5 @@ + (strm >> _tao_aggregate.forward_reference.out ()) + ); + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ForwardRequestA.cpp 2005-04-08 09:05:08.990753600 +0200 -+++ ForwardRequestA.cpp 2005-04-08 09:12:54.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ForwardRequestA.cpp 2005-04-11 16:44:02.454393600 +0200 ++++ ForwardRequestA.cpp 2005-04-11 16:44:44.885406400 +0200 @@ -62,6 +62,8 @@ @@ -70,9 +46,9 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 -@@ -162,3 +164,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -146,3 +148,5 @@ + _tao_elem + ); + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff index ce4cdf8e782..595c5d167aa 100644 --- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff @@ -1,13 +1,5 @@ ---- orig/ImplicitActivationPolicyC.h 2005-04-08 09:05:06.246808000 +0200 -+++ ImplicitActivationPolicyC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ImplicitActivationPolicyC.h 2005-04-11 16:44:00.311312000 +0200 ++++ ImplicitActivationPolicyC.h 2005-04-11 16:46:31.779112000 +0200 @@ -78,6 +78,7 @@ NO_IMPLICIT_ACTIVATION }; @@ -16,21 +8,40 @@ typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; // TAO_IDL - Generated from -@@ -207,11 +208,13 @@ +@@ -207,6 +208,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ++ } // module PortableServer // TAO_IDL - Generated from - // be\be_visitor_traits.cpp:59 - -+#if (TAO_HAS_MINIMUM_POA == 0) +@@ -215,6 +218,7 @@ // Traits specializations. namespace TAO { -@@ -257,6 +260,8 @@ ++#if (TAO_HAS_MINIMUM_POA == 0) + + #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_) + #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_ +@@ -236,11 +240,15 @@ + }; + + #endif /* end #if !defined */ ++ ++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + } + + // TAO_IDL - Generated from + // be\be_visitor_enum/any_op_ch.cpp:51 + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); + TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); + +@@ -257,6 +265,8 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ImplicitActivationPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &); @@ -39,16 +50,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:955 ---- orig/ImplicitActivationPolicyC.cpp 2005-04-08 09:05:06.246808000 +0200 -+++ ImplicitActivationPolicyC.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ImplicitActivationPolicyC.cpp 2005-04-11 16:44:00.311312000 +0200 ++++ ImplicitActivationPolicyC.cpp 2005-04-11 16:45:07.347705600 +0200 @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -58,22 +61,14 @@ // Arg traits specializations. namespace TAO { -@@ -250,3 +252,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -211,3 +213,5 @@ + + return _tao_success; + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ImplicitActivationPolicyA.cpp 2005-04-08 09:05:06.246808000 +0200 -+++ ImplicitActivationPolicyA.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ImplicitActivationPolicyA.cpp 2005-04-11 16:44:00.311312000 +0200 ++++ ImplicitActivationPolicyA.cpp 2005-04-11 16:45:02.230347200 +0200 @@ -36,6 +36,8 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -83,9 +78,9 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 -@@ -203,3 +205,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -177,3 +179,5 @@ + _tao_elem + ); + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff index 3b579c59f3f..8802c550a4c 100644 --- a/TAO/tao/PortableServer/diffs/POAManager.diff +++ b/TAO/tao/PortableServer/diffs/POAManager.diff @@ -1,13 +1,5 @@ ---- orig/POAManagerC.h 2005-04-08 09:05:06.727499200 +0200 -+++ POAManagerC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/POAManagerC.h 2005-04-11 16:44:00.771974400 +0200 ++++ POAManagerC.h 2005-04-11 16:44:04.216928000 +0200 @@ -207,6 +207,8 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff index 9923d1b1c00..a4ddf6b142b 100644 --- a/TAO/tao/PortableServer/diffs/PS_Forward.diff +++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff @@ -1,13 +1,5 @@ ---- orig/PS_ForwardC.h 2005-04-08 09:05:07.598752000 +0200 -+++ PS_ForwardC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/PS_ForwardC.h 2005-04-11 16:44:01.493011200 +0200 ++++ PS_ForwardC.h 2005-04-11 16:44:04.427230400 +0200 @@ -61,11 +61,25 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ diff --git a/TAO/tao/PortableServer/diffs/PortableServer.diff b/TAO/tao/PortableServer/diffs/PortableServer.diff index ad6b94bb713..f79f1875c64 100644 --- a/TAO/tao/PortableServer/diffs/PortableServer.diff +++ b/TAO/tao/PortableServer/diffs/PortableServer.diff @@ -1,13 +1,5 @@ ---- orig/PortableServerC.h 2005-04-08 09:05:07.208190400 +0200 -+++ PortableServerC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/PortableServerC.h 2005-04-11 16:44:01.152521600 +0200 ++++ PortableServerC.h 2005-04-11 16:44:04.287028800 +0200 @@ -36,6 +36,10 @@ #include "ace/config-all.h" @@ -161,16 +153,8 @@ #endif /* ifndef */ - ---- orig/PortableServerC.cpp 2005-04-08 09:05:07.208190400 +0200 -+++ PortableServerC.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/PortableServerC.cpp 2005-04-11 16:44:01.152521600 +0200 ++++ PortableServerC.cpp 2005-04-11 16:44:04.317072000 +0200 @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 @@ -214,16 +198,8 @@ // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 ---- orig/PortableServerA.cpp 2005-04-08 09:05:07.208190400 +0200 -+++ PortableServerA.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/PortableServerA.cpp 2005-04-11 16:44:01.152521600 +0200 ++++ PortableServerA.cpp 2005-04-11 16:44:04.337100800 +0200 @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html @@ -269,35 +245,3 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 -@@ -1180,11 +1188,15 @@ - PortableServer::POA::InvalidPolicy - >; - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::NoServant - >; - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - template class - TAO::Any_Dual_Impl_T< - PortableServer::POA::ObjectAlreadyActive -@@ -1242,11 +1254,15 @@ - PortableServer::POA::InvalidPolicy \ - > - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - # pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::NoServant \ - > - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - # pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - PortableServer::POA::ObjectAlreadyActive \ diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff index c20e354eddd..d6638858330 100644 --- a/TAO/tao/PortableServer/diffs/PortableServer_include.diff +++ b/TAO/tao/PortableServer/diffs/PortableServer_include.diff @@ -1,13 +1,5 @@ ---- orig/PortableServer_includeC.h 2005-04-08 09:05:09.691761600 +0200 -+++ PortableServer_includeC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/PortableServer_includeC.h 2005-04-11 16:44:03.175430400 +0200 ++++ PortableServer_includeC.h 2005-04-11 16:44:05.098195200 +0200 @@ -45,7 +45,7 @@ #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff index 1bbe316b150..63779dbbcda 100644 --- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff +++ b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff @@ -1,13 +1,5 @@ ---- orig/RequestProcessingPolicyC.h 2005-04-08 09:05:07.889169600 +0200 -+++ RequestProcessingPolicyC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/RequestProcessingPolicyC.h 2005-04-11 16:44:01.633212800 +0200 ++++ RequestProcessingPolicyC.h 2005-04-11 16:49:35.953942400 +0200 @@ -79,6 +79,7 @@ USE_SERVANT_MANAGER }; @@ -16,39 +8,51 @@ typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; // TAO_IDL - Generated from -@@ -208,11 +209,13 @@ +@@ -205,6 +206,7 @@ + + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy; + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - } // module PortableServer +@@ -217,6 +219,8 @@ + namespace TAO + { + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_) + #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_ + +@@ -237,11 +241,16 @@ + }; + + #endif /* end #if !defined */ ++ ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + } // TAO_IDL - Generated from - // be\be_visitor_traits.cpp:59 + // be\be_visitor_enum/any_op_ch.cpp:51 +#if (TAO_HAS_MINIMUM_POA == 0) - // Traits specializations. - namespace TAO - { -@@ -258,6 +261,8 @@ ++ + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); + TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); + +@@ -258,6 +267,8 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &); -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ + // TAO_IDL - Generated from // be\be_codegen.cpp:955 ---- orig/RequestProcessingPolicyC.cpp 2005-04-08 09:05:07.889169600 +0200 -+++ RequestProcessingPolicyC.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/RequestProcessingPolicyC.cpp 2005-04-11 16:44:01.633212800 +0200 ++++ RequestProcessingPolicyC.cpp 2005-04-11 16:48:45.451323200 +0200 @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -58,22 +62,14 @@ // Arg traits specializations. namespace TAO { -@@ -250,3 +252,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -211,3 +213,5 @@ + + return _tao_success; + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/RequestProcessingPolicyA.cpp 2005-04-08 09:05:07.889169600 +0200 -+++ RequestProcessingPolicyA.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/RequestProcessingPolicyA.cpp 2005-04-11 16:44:01.633212800 +0200 ++++ RequestProcessingPolicyA.cpp 2005-04-11 16:48:41.295347200 +0200 @@ -36,6 +36,8 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -83,9 +79,9 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 -@@ -204,3 +206,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -178,3 +180,5 @@ + _tao_elem + ); + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff index 9a3621ac62a..e3ba4e633a1 100644 --- a/TAO/tao/PortableServer/diffs/ServantActivator.diff +++ b/TAO/tao/PortableServer/diffs/ServantActivator.diff @@ -1,13 +1,5 @@ ---- orig/ServantActivatorC.h 2005-04-08 09:05:08.199616000 +0200 -+++ ServantActivatorC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantActivatorC.h 2005-04-11 16:44:01.853529600 +0200 ++++ ServantActivatorC.h 2005-04-11 16:44:04.597475200 +0200 @@ -68,6 +68,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -26,16 +18,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:955 ---- orig/ServantActivatorC.cpp 2005-04-08 09:05:08.199616000 +0200 -+++ ServantActivatorC.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantActivatorC.cpp 2005-04-11 16:44:01.853529600 +0200 ++++ ServantActivatorC.cpp 2005-04-11 16:49:49.753785600 +0200 @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -45,22 +29,14 @@ // Arg traits specializations. namespace TAO { -@@ -230,3 +232,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -191,3 +193,5 @@ + { + return false; + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantActivatorA.cpp 2005-04-08 09:05:08.199616000 +0200 -+++ ServantActivatorA.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantActivatorA.cpp 2005-04-11 16:44:01.853529600 +0200 ++++ ServantActivatorA.cpp 2005-04-11 16:49:46.378932800 +0200 @@ -34,6 +34,8 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" @@ -70,9 +46,9 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 -@@ -136,3 +138,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -120,3 +122,5 @@ + _tao_elem + ); + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff index c3c7728f2ba..99d7a7e6dda 100644 --- a/TAO/tao/PortableServer/diffs/ServantLocator.diff +++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff @@ -1,13 +1,5 @@ ---- orig/ServantLocatorC.h 2005-04-08 09:05:08.470004800 +0200 -+++ ServantLocatorC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantLocatorC.h 2005-04-11 16:44:02.053817600 +0200 ++++ ServantLocatorC.h 2005-04-11 16:44:04.727662400 +0200 @@ -69,6 +69,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -35,16 +27,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:955 ---- orig/ServantLocatorC.cpp 2005-04-08 09:05:08.470004800 +0200 -+++ ServantLocatorC.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantLocatorC.cpp 2005-04-11 16:44:02.053817600 +0200 ++++ ServantLocatorC.cpp 2005-04-11 16:50:01.380504000 +0200 @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -54,22 +38,14 @@ // Arg traits specializations. namespace TAO { -@@ -230,3 +232,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -191,3 +193,5 @@ + { + return false; + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantLocatorA.cpp 2005-04-08 09:05:08.470004800 +0200 -+++ ServantLocatorA.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantLocatorA.cpp 2005-04-11 16:44:02.053817600 +0200 ++++ ServantLocatorA.cpp 2005-04-11 16:49:56.843980800 +0200 @@ -35,6 +35,8 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" @@ -79,9 +55,9 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 -@@ -137,3 +139,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -121,3 +123,5 @@ + _tao_elem + ); + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff index 3b24eb9c42a..9e875a07ee1 100644 --- a/TAO/tao/PortableServer/diffs/ServantManager.diff +++ b/TAO/tao/PortableServer/diffs/ServantManager.diff @@ -1,13 +1,5 @@ ---- orig/ServantManagerC.h 2005-04-08 09:05:08.740393600 +0200 -+++ ServantManagerC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantManagerC.h 2005-04-11 16:44:02.234076800 +0200 ++++ ServantManagerC.h 2005-04-11 16:44:04.827806400 +0200 @@ -63,6 +63,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -26,16 +18,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:955 ---- orig/ServantManagerC.cpp 2005-04-08 09:05:08.740393600 +0200 -+++ ServantManagerC.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantManagerC.cpp 2005-04-11 16:44:02.234076800 +0200 ++++ ServantManagerC.cpp 2005-04-11 16:50:18.164638400 +0200 @@ -45,6 +45,7 @@ { } @@ -44,22 +28,14 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_cs.cpp:60 -@@ -225,3 +226,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -186,3 +187,5 @@ + { + return false; + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantManagerA.cpp 2005-04-08 09:05:08.740393600 +0200 -+++ ServantManagerA.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantManagerA.cpp 2005-04-11 16:44:02.234076800 +0200 ++++ ServantManagerA.cpp 2005-04-11 16:50:12.206070400 +0200 @@ -34,6 +34,8 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" @@ -69,9 +45,9 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 -@@ -136,3 +138,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -120,3 +122,5 @@ + _tao_elem + ); + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff index cedf51239c8..79e33f12951 100644 --- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff @@ -1,13 +1,5 @@ ---- orig/ServantRetentionPolicyC.h 2005-04-08 09:05:09.241113600 +0200 -+++ ServantRetentionPolicyC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantRetentionPolicyC.h 2005-04-11 16:44:02.694739200 +0200 ++++ ServantRetentionPolicyC.h 2005-04-11 16:50:59.964744000 +0200 @@ -78,6 +78,7 @@ NON_RETAIN }; @@ -16,21 +8,41 @@ typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; // TAO_IDL - Generated from -@@ -207,11 +208,13 @@ +@@ -207,6 +208,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ++ } // module PortableServer // TAO_IDL - Generated from - // be\be_visitor_traits.cpp:59 - -+#if (TAO_HAS_MINIMUM_POA == 0) - // Traits specializations. +@@ -216,6 +219,8 @@ namespace TAO { -@@ -257,6 +260,8 @@ + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_) + #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_ + +@@ -236,11 +241,15 @@ + }; + + #endif /* end #if !defined */ ++ ++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + } + + // TAO_IDL - Generated from + // be\be_visitor_enum/any_op_ch.cpp:51 + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); + TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &); + +@@ -257,6 +266,8 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &); @@ -39,16 +51,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:955 ---- orig/ServantRetentionPolicyC.cpp 2005-04-08 09:05:09.241113600 +0200 -+++ ServantRetentionPolicyC.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantRetentionPolicyC.cpp 2005-04-11 16:44:02.694739200 +0200 ++++ ServantRetentionPolicyC.cpp 2005-04-11 16:50:33.026008000 +0200 @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -58,22 +62,14 @@ // Arg traits specializations. namespace TAO { -@@ -250,3 +252,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -211,3 +213,5 @@ + + return _tao_success; + } + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantRetentionPolicyA.cpp 2005-04-08 09:05:09.241113600 +0200 -+++ ServantRetentionPolicyA.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ServantRetentionPolicyA.cpp 2005-04-11 16:44:02.694739200 +0200 ++++ ServantRetentionPolicyA.cpp 2005-04-11 16:50:28.539556800 +0200 @@ -36,6 +36,8 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -83,9 +79,9 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 -@@ -203,3 +205,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -177,3 +179,5 @@ + _tao_elem + ); + } + -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff index 76a7ea55cff..2d9874e9c91 100644 --- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff @@ -1,13 +1,5 @@ ---- orig/ThreadPolicyC.h 2005-04-08 09:05:09.511502400 +0200 -+++ ThreadPolicyC.h 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ThreadPolicyC.h 2005-04-11 16:44:02.895027200 +0200 ++++ ThreadPolicyC.h 2005-04-11 16:51:37.889276800 +0200 @@ -78,6 +78,7 @@ SINGLE_THREAD_MODEL }; @@ -16,22 +8,42 @@ typedef ThreadPolicyValue &ThreadPolicyValue_out; // TAO_IDL - Generated from -@@ -207,12 +208,14 @@ +@@ -204,6 +205,8 @@ + + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy; + ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - } // module PortableServer +@@ -216,6 +219,8 @@ + namespace TAO + { + ++#if (TAO_HAS_MINIMUM_POA == 0) ++ + #if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_) + #define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_ + +@@ -236,11 +241,16 @@ + }; + + #endif /* end #if !defined */ ++ ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ ++ + } // TAO_IDL - Generated from - // be\be_visitor_traits.cpp:59 + // be\be_visitor_enum/any_op_ch.cpp:51 - // Traits specializations. +#if (TAO_HAS_MINIMUM_POA == 0) - namespace TAO - { ++ + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue); + TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &); -@@ -257,6 +260,8 @@ +@@ -257,6 +267,8 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); @@ -40,16 +52,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:955 ---- orig/ThreadPolicyC.cpp 2005-04-08 09:05:09.511502400 +0200 -+++ ThreadPolicyC.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/ThreadPolicyC.cpp 2005-04-11 16:44:02.895027200 +0200 ++++ ThreadPolicyC.cpp 2005-04-11 16:51:11.561419200 +0200 @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -59,22 +63,14 @@ // Arg traits specializations. namespace TAO { -@@ -250,3 +252,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -211,3 +213,5 @@ + + return _tao_success; + } + -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ThreadPolicyA.cpp 2005-04-08 09:05:09.511502400 +0200 -+++ ThreadPolicyA.cpp 2005-04-08 09:12:55.000000000 +0200 -@@ -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: ++#endif /* TAO_HAS_MINIMUM_POA == 0 */ +--- orig/ThreadPolicyA.cpp 2005-04-11 16:44:02.895027200 +0200 ++++ ThreadPolicyA.cpp 2005-04-11 16:51:08.827488000 +0200 @@ -36,6 +36,8 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -84,9 +80,9 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 -@@ -203,3 +205,5 @@ - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +@@ -177,3 +179,5 @@ + _tao_elem + ); + } + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ |