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 | 5e98189ba370b76a6b357a96cc38390eb7a7ace3 (patch) | |
tree | 4018e098bca0706166c9d4c48bf3fd695801e31e /TAO/tao/PortableServer/diffs | |
parent | 724ee1b6c7e3c261e7b30c1bb5844dc7afc565c4 (diff) | |
download | ATCD-5e98189ba370b76a6b357a96cc38390eb7a7ace3.tar.gz |
ChangeLogTag: Mon Apr 11 15:43:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer/diffs')
-rw-r--r-- | TAO/tao/PortableServer/diffs/AdapterActivator.diff | 52 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/ForwardRequest.diff | 52 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff | 81 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/POAManager.diff | 12 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/PS_Forward.diff | 12 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/PortableServer.diff | 68 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/PortableServer_include.diff | 12 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff | 90 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/ServantActivator.diff | 52 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/ServantLocator.diff | 52 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/ServantManager.diff | 52 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff | 86 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/ThreadPolicy.diff | 90 |
13 files changed, 247 insertions, 464 deletions
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 */ |