ChangeLogTag: Sun Feb 27 07:42:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 423 insertions, 170 deletions

diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index 5dffc8a5225..9f3c91d8ca6 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -39,18 +39,18 @@ static const CORBA::Long _oc_PortableServer_POAList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f414c69), 
-  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f414c69),
+  ACE_NTOHL (0x73743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POAList:1.0
     8,
-  ACE_NTOHL (0x504f414c), 
+  ACE_NTOHL (0x504f414c),
   ACE_NTOHL (0x69737400),  // name = POAList
     CORBA::tk_sequence, // typecode kind
   8, // encapsulation length
@@ -73,8 +73,6 @@ namespace PortableServer
     &_tc_TAO_tc_PortableServer_POAList;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/typecode_defn.cpp:295
 
@@ -82,14 +80,14 @@ static const CORBA::Long _oc_PortableServer_POA[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f413a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f413a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
     4,
   ACE_NTOHL (0x504f4100),  // name = POA
@@ -109,7 +107,7 @@ namespace PortableServer
     &_tc_TAO_tc_PortableServer_POA;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -181,8 +179,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
@@ -252,7 +248,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -324,7 +320,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -396,7 +392,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -468,7 +464,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)
@@ -544,7 +540,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
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -616,7 +612,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -688,7 +684,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -760,7 +756,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -832,7 +828,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -904,7 +900,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -1108,4 +1104,4 @@ CORBA::Boolean operator>>= (
         PortableServer::POAList \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
index 312cecb9fb0..2c32b987182 100644
--- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff
+++ b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
@@ -1,5 +1,13 @@
---- orig/AdapterActivatorC.h	2005-02-18 11:19:44.306534400 +0100
-+++ AdapterActivatorC.h	2005-02-18 11:19:48.512582400 +0100
+--- orig/AdapterActivatorC.h	2005-02-22 14:55:26.741169600 +0100
++++ AdapterActivatorC.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:
 @@ -73,6 +73,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -9,7 +17,7 @@
  namespace TAO
  {
    class Collocation_Proxy_Broker;
-@@ -227,6 +229,8 @@
+@@ -229,6 +231,8 @@
  TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
  TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
  
@@ -18,25 +26,41 @@
  // TAO_IDL - Generated from
  // be\be_codegen.cpp:961
  
---- orig/AdapterActivatorC.cpp	2005-02-18 11:19:44.306534400 +0100
-+++ AdapterActivatorC.cpp	2005-02-18 11:19:48.522596800 +0100
+--- orig/AdapterActivatorC.cpp	2005-02-22 14:55:26.741169600 +0100
++++ AdapterActivatorC.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:
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:66
+ // be\be_visitor_arg_traits.cpp:69
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // Arg traits specializations.
  namespace TAO
  {
-@@ -227,3 +229,5 @@
+@@ -229,3 +231,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/AdapterActivatorA.cpp	2005-02-18 11:19:44.306534400 +0100
-+++ AdapterActivatorA.cpp	2005-02-18 11:19:48.532611200 +0100
+--- orig/AdapterActivatorA.cpp	2005-02-22 14:55:26.741169600 +0100
++++ AdapterActivatorA.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
diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
index 6fac58626c0..3c50f1eb672 100644
--- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff
+++ b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
@@ -1,5 +1,13 @@
---- orig/ForwardRequestC.h	2005-02-18 11:19:47.210710400 +0100
-+++ ForwardRequestC.h	2005-02-18 11:19:49.133475200 +0100
+--- orig/ForwardRequestC.h	2005-02-22 14:55:30.326324800 +0100
++++ ForwardRequestC.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:
 @@ -66,6 +66,8 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
@@ -18,8 +26,16 @@
  #if defined (__ACE_INLINE__)
  #include "ForwardRequestC.inl"
  #endif /* defined INLINE */
---- orig/ForwardRequestC.cpp	2005-02-18 11:19:47.210710400 +0100
-+++ ForwardRequestC.cpp	2005-02-18 11:19:49.143489600 +0100
+--- orig/ForwardRequestC.cpp	2005-02-22 14:55:30.326324800 +0100
++++ ForwardRequestC.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:
 @@ -43,6 +43,8 @@
  #include "ForwardRequestC.inl"
  #endif /* !defined INLINE */
@@ -27,7 +43,7 @@
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:66
+ // be\be_visitor_arg_traits.cpp:69
  
 @@ -279,3 +281,5 @@
  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -35,8 +51,16 @@
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ForwardRequestA.cpp	2005-02-18 11:19:47.210710400 +0100
-+++ ForwardRequestA.cpp	2005-02-18 11:19:49.153504000 +0100
+--- orig/ForwardRequestA.cpp	2005-02-22 14:55:30.326324800 +0100
++++ ForwardRequestA.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 @@
  #include "tao/Any.h"
  #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
index 054b24b6e16..afc5386a2fd 100644
--- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
@@ -1,5 +1,13 @@
---- orig/ImplicitActivationPolicyC.h	2005-02-18 11:19:44.977499200 +0100
-+++ ImplicitActivationPolicyC.h	2005-02-18 11:19:48.592697600 +0100
+--- orig/ImplicitActivationPolicyC.h	2005-02-22 14:55:27.502264000 +0100
++++ ImplicitActivationPolicyC.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:
 @@ -96,6 +96,7 @@
      NO_IMPLICIT_ACTIVATION
    };
@@ -8,7 +16,7 @@
    typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
    
    // TAO_IDL - Generated from
-@@ -223,11 +224,13 @@
+@@ -225,11 +226,13 @@
  // TAO_IDL - Generated from
  // be\be_visitor_module/module_ch.cpp:66
  
@@ -22,7 +30,7 @@
  // Traits specializations.
  namespace TAO
  {
-@@ -273,6 +276,8 @@
+@@ -275,6 +278,8 @@
  TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
  
@@ -31,25 +39,41 @@
  // TAO_IDL - Generated from
  // be\be_codegen.cpp:961
  
---- orig/ImplicitActivationPolicyC.cpp	2005-02-18 11:19:44.977499200 +0100
-+++ ImplicitActivationPolicyC.cpp	2005-02-18 11:19:48.602712000 +0100
+--- orig/ImplicitActivationPolicyC.cpp	2005-02-22 14:55:27.502264000 +0100
++++ ImplicitActivationPolicyC.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:
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:66
+ // be\be_visitor_arg_traits.cpp:69
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // Arg traits specializations.
  namespace TAO
  {
-@@ -253,3 +255,5 @@
+@@ -255,3 +257,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ImplicitActivationPolicyA.cpp	2005-02-18 11:19:44.977499200 +0100
-+++ ImplicitActivationPolicyA.cpp	2005-02-18 11:19:48.612726400 +0100
+--- orig/ImplicitActivationPolicyA.cpp	2005-02-22 14:55:27.502264000 +0100
++++ ImplicitActivationPolicyA.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
diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff
index 1c2c0f7bf9d..6d379d4b500 100644
--- a/TAO/tao/PortableServer/diffs/POAManager.diff
+++ b/TAO/tao/PortableServer/diffs/POAManager.diff
@@ -1,6 +1,14 @@
---- orig/POAManagerC.h	2005-02-18 11:19:45.388089600 +0100
-+++ POAManagerC.h	2005-02-18 11:19:48.662798400 +0100
-@@ -223,6 +223,8 @@
+--- 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:
+@@ -225,6 +225,8 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
@@ -9,7 +17,7 @@
      virtual void hold_requests (
          ::CORBA::Boolean wait_for_completion
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -257,6 +259,8 @@
+@@ -259,6 +261,8 @@
          ::PortableServer::POAManager::AdapterInactive
        )) = 0;
      
diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff
index 7e18c20dc93..a10ebdf9468 100644
--- a/TAO/tao/PortableServer/diffs/PS_Forward.diff
+++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff
@@ -1,6 +1,14 @@
---- orig/PS_ForwardC.h	2005-02-18 11:19:46.119140800 +0100
-+++ PS_ForwardC.h	2005-02-18 11:22:35.973379200 +0100
-@@ -66,11 +66,25 @@
+--- 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:
+@@ -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 9da55740be0..0aaab7c7879 100644
--- a/TAO/tao/PortableServer/diffs/PortableServer.diff
+++ b/TAO/tao/PortableServer/diffs/PortableServer.diff
@@ -1,5 +1,13 @@
---- orig/PortableServerC.h	2005-02-18 11:19:45.718564800 +0100
-+++ PortableServerC.h	2005-02-18 11:19:48.712870400 +0100
+--- 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:
 @@ -36,6 +36,10 @@
  
  #include "ace/config-all.h"
@@ -11,7 +19,7 @@
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
-@@ -481,6 +485,8 @@
+@@ -483,6 +487,8 @@
      // TAO_IDL - Generated from
      // be\be_visitor_exception/exception_ch.cpp:51
  
@@ -20,7 +28,7 @@
  #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
  #define _PORTABLESERVER_POA_NOSERVANT_CH_
      
-@@ -528,6 +534,8 @@
+@@ -530,6 +536,8 @@
  
  #endif /* end #if !defined */
      
@@ -29,7 +37,7 @@
      // TAO_IDL - Generated from
      // be\be_visitor_exception/exception_ch.cpp:51
  
-@@ -871,6 +879,7 @@
+@@ -873,6 +881,7 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
@@ -37,7 +45,7 @@
      virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
          ::PortableServer::ThreadPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -878,6 +887,7 @@
+@@ -880,6 +889,7 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
@@ -45,7 +53,7 @@
      
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
-@@ -915,6 +925,7 @@
+@@ -917,6 +927,7 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
@@ -53,7 +61,7 @@
      virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
          ::PortableServer::ImplicitActivationPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -922,10 +933,12 @@
+@@ -924,10 +935,12 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
@@ -66,7 +74,7 @@
      virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
          ::PortableServer::ServantRetentionPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -933,10 +946,12 @@
+@@ -935,10 +948,12 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
@@ -79,7 +87,7 @@
      virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
          ::PortableServer::RequestProcessingPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -944,6 +959,7 @@
+@@ -946,6 +961,7 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
@@ -87,7 +95,7 @@
      
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
-@@ -988,6 +1004,8 @@
+@@ -990,6 +1006,8 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
@@ -96,7 +104,7 @@
      virtual ::PortableServer::AdapterActivator_ptr the_activator (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
        )
-@@ -1005,10 +1023,12 @@
+@@ -1007,10 +1025,12 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
@@ -109,7 +117,7 @@
      virtual ::PortableServer::ServantManager_ptr get_servant_manager (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
        )
-@@ -1028,10 +1048,13 @@
+@@ -1030,10 +1050,13 @@
          CORBA::SystemException,
          ::PortableServer::POA::WrongPolicy
        )) = 0;
@@ -123,7 +131,7 @@
      virtual ::PortableServer::Servant get_servant (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
        )
-@@ -1053,6 +1076,8 @@
+@@ -1055,6 +1078,8 @@
          ::PortableServer::POA::WrongPolicy
        )) = 0;
      
@@ -132,7 +140,7 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
-@@ -1314,11 +1339,15 @@
+@@ -1316,11 +1341,15 @@
  // TAO_IDL - Generated from
  // be\be_visitor_exception/any_op_ch.cpp:52
  
@@ -148,13 +156,21 @@
  // TAO_IDL - Generated from
  // be\be_visitor_exception/any_op_ch.cpp:52
  
-@@ -1386,4 +1415,3 @@
+@@ -1388,4 +1417,3 @@
  
  #endif /* ifndef */
  
 -
---- orig/PortableServerC.cpp	2005-02-18 11:19:45.718564800 +0100
-+++ PortableServerC.cpp	2005-02-18 11:19:48.732899200 +0100
+--- 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:
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
  
@@ -180,7 +196,7 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_sequence/sequence_cs.cpp:65
  
-@@ -599,6 +597,8 @@
+@@ -595,6 +593,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/exception_cs.cpp:63
  
@@ -189,8 +205,8 @@
  PortableServer::POA::NoServant::NoServant (void)
    : CORBA::UserException (
          "IDL:omg.org/PortableServer/POA/NoServant:2.3",
-@@ -728,6 +728,8 @@
- ::CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant =
+@@ -724,6 +724,8 @@
+ ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
    &_tc_TAO_tc_PortableServer_POA_NoServant;
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
@@ -198,8 +214,16 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/exception_cs.cpp:63
  
---- orig/PortableServerA.cpp	2005-02-18 11:19:45.718564800 +0100
-+++ PortableServerA.cpp	2005-02-18 11:19:48.752928000 +0100
+--- 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:
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
@@ -209,25 +233,7 @@
  #include "tao/Typecode.h"
  #include "tao/CDR.h"
  #include "tao/Any.h"
-@@ -73,6 +73,8 @@
-     &_tc_TAO_tc_PortableServer_POAList;
- }
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/typecode_defn.cpp:295
- 
-@@ -179,6 +181,8 @@
-       );
- }
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_visitor_interface/any_op_cs.cpp:50
- 
-@@ -467,6 +471,8 @@
+@@ -467,6 +467,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/any_op_cs.cpp:50
  
@@ -236,7 +242,7 @@
  ACE_TEMPLATE_SPECIALIZATION
  CORBA::Boolean
  TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
-@@ -536,6 +542,8 @@
+@@ -536,6 +538,8 @@
        );
  }
  
@@ -245,7 +251,7 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_exception/any_op_cs.cpp:50
  
-@@ -985,11 +993,15 @@
+@@ -985,11 +989,15 @@
          PortableServer::POA::InvalidPolicy
        >;
  
@@ -261,7 +267,7 @@
    template class
      TAO::Any_Dual_Impl_T<
          PortableServer::POA::ObjectAlreadyActive
-@@ -1047,11 +1059,15 @@
+@@ -1047,11 +1055,15 @@
          PortableServer::POA::InvalidPolicy \
        >
  
diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
index 82430d03f8b..f014b38bc45 100644
--- a/TAO/tao/PortableServer/diffs/PortableServer_include.diff
+++ b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
@@ -1,5 +1,13 @@
---- orig/PortableServer_includeC.h	2005-02-18 11:19:47.981819200 +0100
-+++ PortableServer_includeC.h	2005-02-18 11:19:49.323748800 +0100
+--- orig/PortableServer_includeC.h	2005-02-22 14:55:31.297721600 +0100
++++ PortableServer_includeC.h	2005-02-22 14:56:24.994934400 +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:
 @@ -45,7 +45,7 @@
  #include "tao/SystemException.h"
  #include "tao/Environment.h"
@@ -9,3 +17,14 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
+@@ -79,10 +79,6 @@
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:961
+ 
+-#if defined (__ACE_INLINE__)
+-#include "PortableServer_includeC.inl"
+-#endif /* defined INLINE */
+-
+ #if defined(_MSC_VER)
+ #pragma warning(pop)
+ #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
index 750ddc39f11..d0902598ac2 100644
--- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
@@ -1,5 +1,13 @@
---- orig/RequestProcessingPolicyC.h	2005-02-18 11:19:46.359486400 +0100
-+++ RequestProcessingPolicyC.h	2005-02-18 11:19:48.843057600 +0100
+--- 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:
 @@ -97,6 +97,7 @@
      USE_SERVANT_MANAGER
    };
@@ -8,7 +16,7 @@
    typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
    
    // TAO_IDL - Generated from
-@@ -224,11 +225,13 @@
+@@ -226,11 +227,13 @@
  // TAO_IDL - Generated from
  // be\be_visitor_module/module_ch.cpp:66
  
@@ -22,7 +30,7 @@
  // Traits specializations.
  namespace TAO
  {
-@@ -274,6 +277,8 @@
+@@ -276,6 +279,8 @@
  TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
  
@@ -31,25 +39,41 @@
  // TAO_IDL - Generated from
  // be\be_codegen.cpp:961
  
---- orig/RequestProcessingPolicyC.cpp	2005-02-18 11:19:46.359486400 +0100
-+++ RequestProcessingPolicyC.cpp	2005-02-18 11:19:48.853072000 +0100
+--- 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$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:66
+ // be\be_visitor_arg_traits.cpp:69
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // Arg traits specializations.
  namespace TAO
  {
-@@ -253,3 +255,5 @@
+@@ -255,3 +257,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/RequestProcessingPolicyA.cpp	2005-02-18 11:19:46.359486400 +0100
-+++ RequestProcessingPolicyA.cpp	2005-02-18 11:19:48.863086400 +0100
+--- 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
diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff
index d5ef9d427e0..921a7ddb4cc 100644
--- a/TAO/tao/PortableServer/diffs/ServantActivator.diff
+++ b/TAO/tao/PortableServer/diffs/ServantActivator.diff
@@ -1,5 +1,13 @@
---- orig/ServantActivatorC.h	2005-02-18 11:19:46.569788800 +0100
-+++ ServantActivatorC.h	2005-02-18 11:19:48.923172800 +0100
+--- 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:
 @@ -75,6 +75,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -9,7 +17,7 @@
  namespace TAO
  {
    class Collocation_Proxy_Broker;
-@@ -245,6 +247,8 @@
+@@ -247,6 +249,8 @@
  TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
  TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
  
@@ -18,25 +26,41 @@
  // TAO_IDL - Generated from
  // be\be_codegen.cpp:961
  
---- orig/ServantActivatorC.cpp	2005-02-18 11:19:46.569788800 +0100
-+++ ServantActivatorC.cpp	2005-02-18 11:19:48.943201600 +0100
+--- 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$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -45,6 +45,8 @@
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:66
+ // be\be_visitor_arg_traits.cpp:69
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // Arg traits specializations.
  namespace TAO
  {
-@@ -232,3 +234,5 @@
+@@ -234,3 +236,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantActivatorA.cpp	2005-02-18 11:19:46.569788800 +0100
-+++ ServantActivatorA.cpp	2005-02-18 11:19:48.953216000 +0100
+--- 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:
 @@ -34,6 +34,8 @@
  // TAO_IDL - Generated from
  // be\be_visitor_typecode/typecode_defn.cpp:295
diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff
index 31f7a794aae..a496ce70e53 100644
--- a/TAO/tao/PortableServer/diffs/ServantLocator.diff
+++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff
@@ -1,5 +1,13 @@
---- orig/ServantLocatorC.h	2005-02-18 11:19:46.770076800 +0100
-+++ ServantLocatorC.h	2005-02-18 11:19:49.003288000 +0100
+--- 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:
 @@ -76,6 +76,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -18,7 +26,7 @@
      typedef ServantLocator_ptr _ptr_type;
      typedef ServantLocator_var _var_type;
      
-@@ -248,6 +252,8 @@
+@@ -250,6 +254,8 @@
  TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
  TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
  
@@ -27,25 +35,41 @@
  // TAO_IDL - Generated from
  // be\be_codegen.cpp:961
  
---- orig/ServantLocatorC.cpp	2005-02-18 11:19:46.770076800 +0100
-+++ ServantLocatorC.cpp	2005-02-18 11:19:49.013302400 +0100
+--- 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$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -45,6 +45,8 @@
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:66
+ // be\be_visitor_arg_traits.cpp:69
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // Arg traits specializations.
  namespace TAO
  {
-@@ -232,3 +234,5 @@
+@@ -234,3 +236,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantLocatorA.cpp	2005-02-18 11:19:46.770076800 +0100
-+++ ServantLocatorA.cpp	2005-02-18 11:19:49.023316800 +0100
+--- 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
diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff
index 38a1eba32af..c30fd7dd85a 100644
--- a/TAO/tao/PortableServer/diffs/ServantManager.diff
+++ b/TAO/tao/PortableServer/diffs/ServantManager.diff
@@ -1,5 +1,13 @@
---- orig/ServantManagerC.h	2005-02-18 11:19:47.010422400 +0100
-+++ ServantManagerC.h	2005-02-18 11:19:49.063374400 +0100
+--- 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:
 @@ -70,6 +70,8 @@
  // TAO_IDL - Generated from 
  // be\be_visitor_root/root_ch.cpp:62
@@ -9,7 +17,7 @@
  namespace TAO
  {
    class Collocation_Proxy_Broker;
-@@ -212,6 +214,8 @@
+@@ -214,6 +216,8 @@
  TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying
  TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &);
  
@@ -18,8 +26,16 @@
  // TAO_IDL - Generated from
  // be\be_codegen.cpp:961
  
---- orig/ServantManagerC.cpp	2005-02-18 11:19:47.010422400 +0100
-+++ ServantManagerC.cpp	2005-02-18 11:19:49.083403200 +0100
+--- 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$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -49,6 +49,7 @@
  {
  }
@@ -28,14 +44,22 @@
  
  // TAO_IDL - Generated from
  // be\be_visitor_interface/interface_cs.cpp:60
-@@ -227,3 +228,5 @@
+@@ -229,3 +230,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantManagerA.cpp	2005-02-18 11:19:47.010422400 +0100
-+++ ServantManagerA.cpp	2005-02-18 11:19:49.093417600 +0100
+--- 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 @@
  #include "tao/Any.h"
  #include "tao/Any_Impl_T.h"
diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
index b17dd948aa0..29c785c7e3f 100644
--- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
@@ -1,5 +1,13 @@
---- orig/ServantRetentionPolicyC.h	2005-02-18 11:19:47.481099200 +0100
-+++ ServantRetentionPolicyC.h	2005-02-18 11:19:49.193561600 +0100
+--- 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:
 @@ -96,6 +96,7 @@
      NON_RETAIN
    };
@@ -8,7 +16,7 @@
    typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
    
    // TAO_IDL - Generated from
-@@ -223,11 +224,13 @@
+@@ -225,11 +226,13 @@
  // TAO_IDL - Generated from
  // be\be_visitor_module/module_ch.cpp:66
  
@@ -22,7 +30,7 @@
  // Traits specializations.
  namespace TAO
  {
-@@ -273,6 +276,8 @@
+@@ -275,6 +278,8 @@
  TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
  
@@ -31,25 +39,41 @@
  // TAO_IDL - Generated from
  // be\be_codegen.cpp:961
  
---- orig/ServantRetentionPolicyC.cpp	2005-02-18 11:19:47.481099200 +0100
-+++ ServantRetentionPolicyC.cpp	2005-02-18 11:19:49.203576000 +0100
+--- 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$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:66
+ // be\be_visitor_arg_traits.cpp:69
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // Arg traits specializations.
  namespace TAO
  {
-@@ -253,3 +255,5 @@
+@@ -255,3 +257,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantRetentionPolicyA.cpp	2005-02-18 11:19:47.481099200 +0100
-+++ ServantRetentionPolicyA.cpp	2005-02-18 11:19:49.213590400 +0100
+--- 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
diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
index b9c83503050..1987c2edc64 100644
--- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
+++ b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
@@ -1,5 +1,13 @@
---- orig/ThreadPolicyC.h	2005-02-18 11:19:47.691401600 +0100
-+++ ThreadPolicyC.h	2005-02-18 11:19:49.263662400 +0100
+--- 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:
 @@ -96,6 +96,7 @@
      SINGLE_THREAD_MODEL
    };
@@ -8,7 +16,7 @@
    typedef ThreadPolicyValue &ThreadPolicyValue_out;
    
    // TAO_IDL - Generated from
-@@ -223,12 +224,14 @@
+@@ -225,12 +226,14 @@
  // TAO_IDL - Generated from
  // be\be_visitor_module/module_ch.cpp:66
  
@@ -23,7 +31,7 @@
  namespace TAO
  {
  
-@@ -273,6 +276,8 @@
+@@ -275,6 +278,8 @@
  TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
  TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
  
@@ -32,25 +40,41 @@
  // TAO_IDL - Generated from
  // be\be_codegen.cpp:961
  
---- orig/ThreadPolicyC.cpp	2005-02-18 11:19:47.691401600 +0100
-+++ ThreadPolicyC.cpp	2005-02-18 11:19:49.273676800 +0100
+--- 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$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -44,6 +44,8 @@
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:66
+ // be\be_visitor_arg_traits.cpp:69
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  // Arg traits specializations.
  namespace TAO
  {
-@@ -253,3 +255,5 @@
+@@ -255,3 +257,5 @@
        >
  
  #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ThreadPolicyA.cpp	2005-02-18 11:19:47.691401600 +0100
-+++ ThreadPolicyA.cpp	2005-02-18 11:19:49.283691200 +0100
+--- 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