ChangeLogTag: Tue Jun 20 07:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 0 insertions, 649 deletions

diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
deleted file mode 100644
index cb97401f33c..00000000000
--- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- namespace PortableServer
- {
--  
-   // TAO_IDL - Generated from
-   // be\be_interface.cpp:598
- 
-@@ -211,6 +212,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 &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -186,3 +188,5 @@
- {
-   return false;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- 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"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/objref_typecode.cpp:76
- 
-@@ -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
deleted file mode 100644
index cd868c7cea6..00000000000
--- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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__ */
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:48
- 
-@@ -153,6 +155,8 @@
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- #if defined(_MSC_VER)
- #pragma warning(pop)
- #endif /* _MSC_VER */
---- 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__ */
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-@@ -202,3 +204,5 @@
-     (strm >> _tao_aggregate.forward_reference.out ())
-   );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- 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 @@
- 
- 
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from 
- // be\be_visitor_exception/any_op_cs.cpp:50
- 
-@@ -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
deleted file mode 100644
index 595c5d167aa..00000000000
--- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
+++ /dev/null
@@ -1,86 +0,0 @@
---- 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
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-   
-   // TAO_IDL - Generated from
-@@ -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
-@@ -215,6 +218,7 @@
- // Traits specializations.
- namespace TAO
- {
-+#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 &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -211,3 +213,5 @@
-   
-   return _tao_success;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- 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"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/enum_typecode.cpp:34
- 
-@@ -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
deleted file mode 100644
index 8802c550a4c..00000000000
--- a/TAO/tao/PortableServer/diffs/POAManager.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-     virtual void hold_requests (
-         ::CORBA::Boolean wait_for_completion
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -241,6 +243,8 @@
-         ::PortableServer::POAManager::AdapterInactive
-       )) = 0;
-     
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
deleted file mode 100644
index 63779dbbcda..00000000000
--- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- 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
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-   
-   // TAO_IDL - Generated from
-@@ -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
- 
-@@ -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_enum/any_op_ch.cpp:51
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
- 
-@@ -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_POA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -211,3 +213,5 @@
-   
-   return _tao_success;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- 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"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/enum_typecode.cpp:34
- 
-@@ -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
deleted file mode 100644
index e3ba4e633a1..00000000000
--- a/TAO/tao/PortableServer/diffs/ServantActivator.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- namespace PortableServer
- {
-   
-@@ -229,6 +231,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 &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -191,3 +193,5 @@
- {
-   return false;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- 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"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/objref_typecode.cpp:76
- 
-@@ -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
deleted file mode 100644
index 99d7a7e6dda..00000000000
--- a/TAO/tao/PortableServer/diffs/ServantLocator.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- namespace PortableServer
- {
-   
-@@ -105,6 +107,8 @@
-     : public virtual ::PortableServer::ServantManager
-   {
-   public:
-+    typedef void *Cookie;
-+
-     typedef ServantLocator_ptr _ptr_type;
-     typedef ServantLocator_var _var_type;
-     
-@@ -232,6 +236,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 &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -191,3 +193,5 @@
- {
-   return false;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- 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"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/objref_typecode.cpp:76
- 
-@@ -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
deleted file mode 100644
index 9e875a07ee1..00000000000
--- a/TAO/tao/PortableServer/diffs/ServantManager.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- namespace PortableServer
- {
-   
-@@ -196,6 +198,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 &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- 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 @@
- {
- }
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
- 
- // TAO_IDL - Generated from
- // be\be_visitor_interface/interface_cs.cpp:60
-@@ -186,3 +187,5 @@
- {
-   return false;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- 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"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/objref_typecode.cpp:76
- 
-@@ -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
deleted file mode 100644
index 79e33f12951..00000000000
--- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- 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
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-   
-   // TAO_IDL - Generated from
-@@ -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
-@@ -216,6 +219,8 @@
- namespace TAO
- {
- 
-+#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 &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -211,3 +213,5 @@
-   
-   return _tao_success;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- 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"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/enum_typecode.cpp:34
- 
-@@ -177,3 +179,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
deleted file mode 100644
index 2d9874e9c91..00000000000
--- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
+++ /dev/null
@@ -1,88 +0,0 @@
---- 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
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   typedef ThreadPolicyValue &ThreadPolicyValue_out;
-   
-   // TAO_IDL - Generated from
-@@ -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
- 
-@@ -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_enum/any_op_ch.cpp:51
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
- 
-@@ -257,6 +267,8 @@
- 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:955
- 
---- 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
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -211,3 +213,5 @@
-   
-   return _tao_success;
- }
-+
-+#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"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/enum_typecode.cpp:34
- 
-@@ -177,3 +179,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */