ChangeLogTag: Fri Mar 25 18:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 164 insertions, 346 deletions

diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
index 2c32b987182..b16f357f65c 100644
--- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff
+++ b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
@@ -1,5 +1,5 @@
---- orig/AdapterActivatorC.h	2005-02-22 14:55:26.741169600 +0100
-+++ AdapterActivatorC.h	2005-02-22 14:56:54.000000000 +0100
+--- orig/AdapterActivatorC.h	2005-03-25 15:45:52.076408000 +0100
++++ AdapterActivatorC.h	2005-03-25 15:48:48.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -24,10 +24,10 @@
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
+ // be\be_codegen.cpp:969
  
---- orig/AdapterActivatorC.cpp	2005-02-22 14:55:26.741169600 +0100
-+++ AdapterActivatorC.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/AdapterActivatorC.cpp	2005-03-25 15:45:52.076408000 +0100
++++ AdapterActivatorC.cpp	2005-03-25 15:48:48.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -51,8 +51,8 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/AdapterActivatorA.cpp	2005-02-22 14:55:26.741169600 +0100
-+++ AdapterActivatorA.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/AdapterActivatorA.cpp	2005-03-25 15:45:52.126480000 +0100
++++ AdapterActivatorA.cpp	2005-03-25 15:48:48.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -61,16 +61,16 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -34,6 +34,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+@@ -35,6 +35,8 @@
+ #include "tao/Any.h"
+ #include "tao/Any_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
- {
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -156,3 +158,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/objref_typecode.cpp:73
+ 
+@@ -137,3 +139,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
index 3c50f1eb672..0b3aaf6c251 100644
--- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff
+++ b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
@@ -1,5 +1,5 @@
---- orig/ForwardRequestC.h	2005-02-22 14:55:30.326324800 +0100
-+++ ForwardRequestC.h	2005-02-22 14:56:54.000000000 +0100
+--- orig/ForwardRequestC.h	2005-03-25 15:46:10.002184000 +0100
++++ ForwardRequestC.h	2005-03-25 15:49:50.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -19,15 +19,15 @@
  
 @@ -160,6 +162,8 @@
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
+ // be\be_codegen.cpp:969
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  #if defined (__ACE_INLINE__)
  #include "ForwardRequestC.inl"
  #endif /* defined INLINE */
---- orig/ForwardRequestC.cpp	2005-02-22 14:55:30.326324800 +0100
-+++ ForwardRequestC.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/ForwardRequestC.cpp	2005-03-25 15:46:10.002184000 +0100
++++ ForwardRequestC.cpp	2005-03-25 15:49:50.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -36,7 +36,7 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -43,6 +43,8 @@
+@@ -46,6 +46,8 @@
  #include "ForwardRequestC.inl"
  #endif /* !defined INLINE */
  
@@ -45,14 +45,14 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
  
-@@ -279,3 +281,5 @@
+@@ -219,3 +221,5 @@
  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ForwardRequestA.cpp	2005-02-22 14:55:30.326324800 +0100
-+++ ForwardRequestA.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/ForwardRequestA.cpp	2005-03-25 15:46:10.002184000 +0100
++++ ForwardRequestA.cpp	2005-03-25 15:49:50.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -61,16 +61,16 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -31,6 +31,8 @@
- #include "tao/Any.h"
- #include "tao/Any_Dual_Impl_T.h"
+@@ -61,6 +61,8 @@
+ 
+ 
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/any_op_cs.cpp:50
  
-@@ -131,3 +133,5 @@
+@@ -161,3 +163,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
index afc5386a2fd..b910af0f974 100644
--- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
@@ -1,5 +1,5 @@
---- orig/ImplicitActivationPolicyC.h	2005-02-22 14:55:27.502264000 +0100
-+++ ImplicitActivationPolicyC.h	2005-02-22 14:56:54.000000000 +0100
+--- orig/ImplicitActivationPolicyC.h	2005-03-25 15:45:54.169417600 +0100
++++ ImplicitActivationPolicyC.h	2005-03-25 15:55:03.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -31,16 +31,16 @@
  namespace TAO
  {
 @@ -275,6 +278,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ImplicitActivationPolicyValue);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
+ // be\be_codegen.cpp:969
  
---- orig/ImplicitActivationPolicyC.cpp	2005-02-22 14:55:27.502264000 +0100
-+++ ImplicitActivationPolicyC.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/ImplicitActivationPolicyC.cpp	2005-03-25 15:45:54.159403200 +0100
++++ ImplicitActivationPolicyC.cpp	2005-03-25 15:55:03.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -58,14 +58,14 @@
  // Arg traits specializations.
  namespace TAO
  {
-@@ -255,3 +257,5 @@
+@@ -254,3 +256,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ImplicitActivationPolicyA.cpp	2005-02-22 14:55:27.502264000 +0100
-+++ ImplicitActivationPolicyA.cpp	2005-02-22 14:56:54.000000000 +0100
+--- orig/ImplicitActivationPolicyA.cpp	2005-03-25 15:45:54.169417600 +0100
++++ ImplicitActivationPolicyA.cpp	2005-03-25 15:55:03.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -74,16 +74,16 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -35,6 +35,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+@@ -37,6 +37,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Basic_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -261,3 +263,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/enum_typecode.cpp:34
+ 
+@@ -204,3 +206,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff
index 6d379d4b500..2d1b8a32d49 100644
--- a/TAO/tao/PortableServer/diffs/POAManager.diff
+++ b/TAO/tao/PortableServer/diffs/POAManager.diff
@@ -1,13 +1,5 @@
---- orig/POAManagerC.h	2005-02-22 14:55:27.992969600 +0100
-+++ POAManagerC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/POAManagerC.h	2005-03-25 15:45:59.657308800 +0100
++++ POAManagerC.h	2005-03-25 15:46:16.331284800 +0100
 @@ -225,6 +225,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 a10ebdf9468..3729d4ad123 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-02-22 14:55:29.024452800 +0100
-+++ PS_ForwardC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/PS_ForwardC.h	2005-03-25 15:46:06.196712000 +0100
++++ PS_ForwardC.h	2005-03-25 15:46:17.082364800 +0100
 @@ -68,11 +68,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 0aaab7c7879..d9245abacbc 100644
--- a/TAO/tao/PortableServer/diffs/PortableServer.diff
+++ b/TAO/tao/PortableServer/diffs/PortableServer.diff
@@ -1,13 +1,5 @@
---- orig/PortableServerC.h	2005-02-22 15:00:22.316185600 +0100
-+++ PortableServerC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/PortableServerC.h	2005-03-25 15:46:01.159468800 +0100
++++ PortableServerC.h	2005-03-25 15:46:16.791947200 +0100
 @@ -36,6 +36,10 @@
  
  #include "ace/config-all.h"
@@ -161,16 +153,8 @@
  #endif /* ifndef */
  
 -
---- orig/PortableServerC.cpp	2005-02-22 15:00:22.316185600 +0100
-+++ PortableServerC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/PortableServerC.cpp	2005-03-25 15:46:02.180937600 +0100
++++ PortableServerC.cpp	2005-03-25 15:46:16.862048000 +0100
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
  
@@ -179,8 +163,8 @@
 +#include "PortableServer.h"
  #include "tao/CDR.h"
  #include "tao/ORB_Core.h"
- #include "tao/Typecode.h"
-@@ -50,7 +50,6 @@
+ #include "tao/Null_RefCount_Policy.h"
+@@ -56,7 +56,6 @@
  // Arg traits specializations.
  namespace TAO
  {
@@ -188,7 +172,7 @@
  #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
  #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
    
-@@ -69,7 +68,6 @@
+@@ -75,7 +74,6 @@
  #endif /* end #if !defined */
  }
  
@@ -196,7 +180,7 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_sequence/sequence_cs.cpp:65
  
-@@ -595,6 +593,8 @@
+@@ -474,6 +472,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/exception_cs.cpp:63
  
@@ -205,44 +189,36 @@
  PortableServer::POA::NoServant::NoServant (void)
    : CORBA::UserException (
          "IDL:omg.org/PortableServer/POA/NoServant:2.3",
-@@ -724,6 +724,8 @@
- ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
-   &_tc_TAO_tc_PortableServer_POA_NoServant;
+@@ -566,6 +566,8 @@
+   return ::PortableServer::POA::_tc_NoServant;
+ }
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/exception_cs.cpp:63
  
---- orig/PortableServerA.cpp	2005-02-22 15:00:22.316185600 +0100
-+++ PortableServerA.cpp	2005-02-27 08:49:04.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/PortableServerA.cpp	2005-03-25 15:46:02.180937600 +0100
++++ PortableServerA.cpp	2005-03-25 17:28:43.860998400 +0100
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "PortableServerC.h"
 +#include "PortableServer.h"
- #include "tao/Typecode.h"
- #include "tao/CDR.h"
- #include "tao/Any.h"
-@@ -467,6 +467,8 @@
- // TAO_IDL - Generated from 
- // be\be_visitor_exception/any_op_cs.cpp:50
+ #include "tao/Null_RefCount_Policy.h"
+ #include "tao/TypeCode_Constants.h"
+ #include "tao/Alias_TypeCode.h"
+@@ -308,6 +308,8 @@
+   return false;
+ }
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  ACE_TEMPLATE_SPECIALIZATION
  CORBA::Boolean
- TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
-@@ -536,6 +538,8 @@
+ TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
+@@ -437,6 +439,8 @@
        );
  }
  
@@ -251,7 +227,7 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/any_op_cs.cpp:50
  
-@@ -985,11 +989,15 @@
+@@ -1174,11 +1178,15 @@
          PortableServer::POA::InvalidPolicy
        >;
  
@@ -267,7 +243,7 @@
    template class
      TAO::Any_Dual_Impl_T<
          PortableServer::POA::ObjectAlreadyActive
-@@ -1047,11 +1055,15 @@
+@@ -1236,11 +1244,15 @@
          PortableServer::POA::InvalidPolicy \
        >
  
diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
index f014b38bc45..f938a673eec 100644
--- a/TAO/tao/PortableServer/diffs/PortableServer_include.diff
+++ b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
@@ -1,5 +1,5 @@
---- orig/PortableServer_includeC.h	2005-02-22 14:55:31.297721600 +0100
-+++ PortableServer_includeC.h	2005-02-22 14:56:24.994934400 +0100
+--- orig/PortableServer_includeC.h	2005-03-25 15:46:11.914934400 +0100
++++ PortableServer_includeC.h	2005-03-25 15:47:19.141601600 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -17,14 +17,16 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -79,10 +79,6 @@
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
+@@ -77,11 +77,7 @@
+ }
  
+ // TAO_IDL - Generated from
+-// be\be_codegen.cpp:969
+-
 -#if defined (__ACE_INLINE__)
 -#include "PortableServer_includeC.inl"
 -#endif /* defined INLINE */
--
++// be\be_codegen.cpp:961
+ 
  #if defined(_MSC_VER)
  #pragma warning(pop)
- #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
index d0902598ac2..48cb404a346 100644
--- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
@@ -1,13 +1,5 @@
---- orig/RequestProcessingPolicyC.h	2005-02-22 14:55:29.304856000 +0100
-+++ RequestProcessingPolicyC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/RequestProcessingPolicyC.h	2005-03-25 15:46:07.668828800 +0100
++++ RequestProcessingPolicyC.h	2005-03-25 15:46:17.252609600 +0100
 @@ -97,6 +97,7 @@
      USE_SERVANT_MANAGER
    };
@@ -31,24 +23,16 @@
  namespace TAO
  {
 @@ -276,6 +279,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
+ 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 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/RequestProcessingPolicyC.cpp	2005-02-22 14:55:29.304856000 +0100
-+++ RequestProcessingPolicyC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/RequestProcessingPolicyC.cpp	2005-03-25 15:46:07.668828800 +0100
++++ RequestProcessingPolicyC.cpp	2005-03-25 15:46:17.282652800 +0100
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -58,32 +42,24 @@
  // Arg traits specializations.
  namespace TAO
  {
-@@ -255,3 +257,5 @@
+@@ -254,3 +256,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/RequestProcessingPolicyA.cpp	2005-02-22 14:55:29.304856000 +0100
-+++ RequestProcessingPolicyA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -103,6 +103,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+--- orig/RequestProcessingPolicyA.cpp	2005-03-25 15:46:07.668828800 +0100
++++ RequestProcessingPolicyA.cpp	2005-03-25 17:36:54.516526400 +0100
+@@ -37,6 +37,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Basic_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
- {
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -266,3 +268,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/enum_typecode.cpp:34
+ 
+@@ -205,3 +207,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff
index 921a7ddb4cc..52ab76d1832 100644
--- a/TAO/tao/PortableServer/diffs/ServantActivator.diff
+++ b/TAO/tao/PortableServer/diffs/ServantActivator.diff
@@ -1,13 +1,5 @@
---- orig/ServantActivatorC.h	2005-02-22 14:55:29.575244800 +0100
-+++ ServantActivatorC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantActivatorC.h	2005-03-25 15:46:08.189577600 +0100
++++ ServantActivatorC.h	2005-03-25 15:46:17.512984000 +0100
 @@ -75,6 +75,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -24,18 +16,10 @@
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ServantActivatorC.cpp	2005-02-22 14:55:29.575244800 +0100
-+++ ServantActivatorC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantActivatorC.cpp	2005-03-25 15:46:08.189577600 +0100
++++ ServantActivatorC.cpp	2005-03-25 15:46:17.563056000 +0100
 @@ -45,6 +45,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -51,26 +35,18 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantActivatorA.cpp	2005-02-22 14:55:29.575244800 +0100
-+++ ServantActivatorA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantActivatorA.cpp	2005-03-25 15:46:08.189577600 +0100
++++ ServantActivatorA.cpp	2005-03-25 17:30:26.718900800 +0100
 @@ -34,6 +34,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+ #include "tao/Any.h"
+ #include "tao/Any_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ServantActivator[] =
- {
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -156,3 +158,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/objref_typecode.cpp:73
+ 
+@@ -136,3 +138,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff
index a496ce70e53..3935feada84 100644
--- a/TAO/tao/PortableServer/diffs/ServantLocator.diff
+++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff
@@ -1,13 +1,5 @@
---- orig/ServantLocatorC.h	2005-02-22 14:55:29.845633600 +0100
-+++ ServantLocatorC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantLocatorC.h	2005-03-25 15:46:08.800456000 +0100
++++ ServantLocatorC.h	2005-03-25 15:46:17.743315200 +0100
 @@ -76,6 +76,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -33,18 +25,10 @@
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ServantLocatorC.cpp	2005-02-22 14:55:29.845633600 +0100
-+++ ServantLocatorC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantLocatorC.cpp	2005-03-25 15:46:08.800456000 +0100
++++ ServantLocatorC.cpp	2005-03-25 15:46:17.773358400 +0100
 @@ -45,6 +45,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -60,26 +44,18 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantLocatorA.cpp	2005-02-22 14:55:29.845633600 +0100
-+++ ServantLocatorA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -34,6 +34,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+--- orig/ServantLocatorA.cpp	2005-03-25 15:46:08.800456000 +0100
++++ ServantLocatorA.cpp	2005-03-25 17:30:54.158356800 +0100
+@@ -35,6 +35,8 @@
+ #include "tao/Any.h"
+ #include "tao/Any_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ServantLocator[] =
- {
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -155,3 +157,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/objref_typecode.cpp:73
+ 
+@@ -137,3 +139,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff
index c30fd7dd85a..2b9d8f5fabf 100644
--- a/TAO/tao/PortableServer/diffs/ServantManager.diff
+++ b/TAO/tao/PortableServer/diffs/ServantManager.diff
@@ -1,13 +1,5 @@
---- orig/ServantManagerC.h	2005-02-22 14:55:30.075964800 +0100
-+++ ServantManagerC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantManagerC.h	2005-03-25 15:46:09.541521600 +0100
++++ ServantManagerC.h	2005-03-25 15:46:17.983660800 +0100
 @@ -70,6 +70,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -24,18 +16,10 @@
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ServantManagerC.cpp	2005-02-22 14:55:30.075964800 +0100
-+++ ServantManagerC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantManagerC.cpp	2005-03-25 15:46:09.541521600 +0100
++++ ServantManagerC.cpp	2005-03-25 15:46:18.023718400 +0100
 @@ -49,6 +49,7 @@
  {
  }
@@ -50,26 +34,18 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantManagerA.cpp	2005-02-22 14:55:30.075964800 +0100
-+++ ServantManagerA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -31,6 +31,8 @@
+--- orig/ServantManagerA.cpp	2005-03-25 15:46:09.541521600 +0100
++++ ServantManagerA.cpp	2005-03-25 15:46:18.063776000 +0100
+@@ -34,6 +34,8 @@
  #include "tao/Any.h"
  #include "tao/Any_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+ // be\be_visitor_typecode/objref_typecode.cpp:73
  
-@@ -155,3 +157,5 @@
+@@ -136,3 +138,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
index 29c785c7e3f..96a8f965caa 100644
--- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
@@ -1,13 +1,5 @@
---- orig/ServantRetentionPolicyC.h	2005-02-22 14:55:30.616742400 +0100
-+++ ServantRetentionPolicyC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantRetentionPolicyC.h	2005-03-25 15:46:10.593033600 +0100
++++ ServantRetentionPolicyC.h	2005-03-25 15:46:18.524438400 +0100
 @@ -96,6 +96,7 @@
      NON_RETAIN
    };
@@ -31,24 +23,16 @@
  namespace TAO
  {
 @@ -275,6 +278,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ServantRetentionPolicyC.cpp	2005-02-22 14:55:30.616742400 +0100
-+++ ServantRetentionPolicyC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ServantRetentionPolicyC.cpp	2005-03-25 15:46:10.593033600 +0100
++++ ServantRetentionPolicyC.cpp	2005-03-25 15:46:18.564496000 +0100
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -58,32 +42,24 @@
  // Arg traits specializations.
  namespace TAO
  {
-@@ -255,3 +257,5 @@
+@@ -254,3 +256,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantRetentionPolicyA.cpp	2005-02-22 14:55:30.616742400 +0100
-+++ ServantRetentionPolicyA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -35,6 +35,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+--- orig/ServantRetentionPolicyA.cpp	2005-03-25 15:46:10.593033600 +0100
++++ ServantRetentionPolicyA.cpp	2005-03-25 17:38:13.389940800 +0100
+@@ -37,6 +37,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Basic_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -252,3 +254,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/enum_typecode.cpp:34
+ 
+@@ -204,3 +206,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
index 1987c2edc64..494cb6fd13f 100644
--- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
@@ -1,13 +1,5 @@
---- orig/ThreadPolicyC.h	2005-02-22 14:55:30.887131200 +0100
-+++ ThreadPolicyC.h	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ThreadPolicyC.h	2005-03-25 15:46:11.123796800 +0100
++++ ThreadPolicyC.h	2005-03-25 15:46:18.754769600 +0100
 @@ -96,6 +96,7 @@
      SINGLE_THREAD_MODEL
    };
@@ -32,24 +24,16 @@
  {
  
 @@ -275,6 +278,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
  // TAO_IDL - Generated from
- // be\be_codegen.cpp:961
- 
---- orig/ThreadPolicyC.cpp	2005-02-22 14:55:30.887131200 +0100
-+++ ThreadPolicyC.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ // be\be_codegen.cpp:969
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/ThreadPolicyC.cpp	2005-03-25 15:46:11.123796800 +0100
++++ ThreadPolicyC.cpp	2005-03-25 15:46:18.814856000 +0100
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
@@ -59,32 +43,24 @@
  // Arg traits specializations.
  namespace TAO
  {
-@@ -255,3 +257,5 @@
+@@ -254,3 +256,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ThreadPolicyA.cpp	2005-02-22 14:55:30.887131200 +0100
-+++ ThreadPolicyA.cpp	2005-02-22 14:56:54.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -35,6 +35,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
+--- orig/ThreadPolicyA.cpp	2005-03-25 15:46:11.133811200 +0100
++++ ThreadPolicyA.cpp	2005-03-25 17:41:50.912723200 +0100
+@@ -37,6 +37,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Basic_Impl_T.h"
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -247,3 +249,5 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/enum_typecode.cpp:34
+ 
+@@ -204,3 +206,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */