ChangeLogTag: Wed Oct 29 10:23:42 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 120 insertions, 2 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 65014a342b0..7a5203545a5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Wed Oct 29 10:23:42 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Object_Proxy_Broker.h:
+        * tao/Remote_Object_Proxy_Broker.h:
+
+          Added #include of orbconf.h to pull in TAO_HAS_MINIMUM_CORBA flag.
+
+        * tao/PortableServer/PortableServerC.cpp:
+        * tao/PortableServer/PortableServerC.h:
+
+          Added TAO_HAS_MINIMUM_POA guards around TAO::Objref_Traits<>
+          specializations, TAO::Arg_Traits<> specializations and
+          associated explicit template instantiations.
+
 Wed Oct 29 09:53:09 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/TypeCodeFactory_Adapter.h: Added a missing inclusion. 
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index a017e60ffd8..de46ccee6e1 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -28,6 +28,7 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
+#include "tao/orbconf.h"
 
 namespace CORBA
 {
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 132036a7d8d..e8918dc4e54 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -155,6 +155,8 @@ namespace TAO
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (__TAO_SEQ_PORTABLESERVER_OBJECTID___ARG_TRAITS_CS_)
 #define __TAO_SEQ_PORTABLESERVER_OBJECTID___ARG_TRAITS_CS_
 
@@ -171,6 +173,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
 
@@ -188,6 +192,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_THREADPOLICY__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_THREADPOLICY__ARG_TRAITS_CS_
 
@@ -205,6 +211,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
 
@@ -324,6 +332,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ARG_TRAITS_CS_
 
@@ -341,6 +351,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
 
@@ -358,6 +370,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__ARG_TRAITS_CS_
 
@@ -375,6 +389,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
 
@@ -392,6 +408,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__ARG_TRAITS_CS_
 
@@ -409,6 +427,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 #if !defined (_PORTABLESERVER_POAMANAGER__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_POAMANAGER__ARG_TRAITS_CS_
 
@@ -443,6 +463,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
 
@@ -477,6 +499,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 #if !defined (_PORTABLESERVER_POA__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_POA__ARG_TRAITS_CS_
 
@@ -5678,6 +5702,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
@@ -5708,8 +5734,6 @@ TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::demarshal_value (
   return 1;
 }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -7427,6 +7451,8 @@ CORBA::Boolean operator>> (
         PortableServer::ThreadPolicyValue
       >;
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   template class TAO::Objref_Traits<PortableServer::ThreadPolicy>;
 
   template class
@@ -7444,6 +7470,8 @@ CORBA::Boolean operator>> (
         PortableServer::ThreadPolicy
       >;
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   template class
     TAO::Any_Basic_Impl_T<
         PortableServer::LifespanPolicyValue
@@ -7515,6 +7543,8 @@ CORBA::Boolean operator>> (
         PortableServer::ImplicitActivationPolicyValue
       >;
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   template class TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>;
 
   template class
@@ -7532,11 +7562,15 @@ CORBA::Boolean operator>> (
         PortableServer::ImplicitActivationPolicy
       >;
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   template class
     TAO::Any_Basic_Impl_T<
         PortableServer::ServantRetentionPolicyValue
       >;
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   template class TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>;
 
   template class
@@ -7554,11 +7588,15 @@ CORBA::Boolean operator>> (
         PortableServer::ServantRetentionPolicy
       >;
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   template class
     TAO::Any_Basic_Impl_T<
         PortableServer::RequestProcessingPolicyValue
       >;
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   template class TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>;
 
   template class
@@ -7576,6 +7614,8 @@ CORBA::Boolean operator>> (
         PortableServer::RequestProcessingPolicy
       >;
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   template class
     TAO::Any_Basic_Impl_T<
         PortableServer::POAManager::State
@@ -7598,6 +7638,8 @@ CORBA::Boolean operator>> (
         PortableServer::POAManager
       >;
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   template class TAO::Objref_Traits<PortableServer::AdapterActivator>;
 
   template class
@@ -7666,6 +7708,8 @@ CORBA::Boolean operator>> (
         PortableServer::ServantLocator
       >;
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   template class TAO::Objref_Traits<PortableServer::Current>;
 
   template class
@@ -7683,11 +7727,20 @@ CORBA::Boolean operator>> (
         PortableServer::Current
       >;
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
   template class
     TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>;
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   template class
     TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>;
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   template class
     TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>;
 
@@ -7793,6 +7846,8 @@ CORBA::Boolean operator>> (
         PortableServer::ThreadPolicyValue \
       >
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 # pragma instantiate TAO::Objref_Traits<PortableServer::ThreadPolicy>
 
 # pragma instantiate \
@@ -7810,6 +7865,8 @@ CORBA::Boolean operator>> (
         PortableServer::ThreadPolicy \
       >
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 # pragma instantiate \
     TAO::Any_Basic_Impl_T< \
         PortableServer::LifespanPolicyValue \
@@ -7881,6 +7938,8 @@ CORBA::Boolean operator>> (
         PortableServer::ImplicitActivationPolicyValue \
       >
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 # pragma instantiate TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>
 
 # pragma instantiate \
@@ -7898,11 +7957,15 @@ CORBA::Boolean operator>> (
         PortableServer::ImplicitActivationPolicy \
       >
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 # pragma instantiate \
     TAO::Any_Basic_Impl_T< \
         PortableServer::ServantRetentionPolicyValue \
       >
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 # pragma instantiate TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>
 
 # pragma instantiate \
@@ -7920,11 +7983,15 @@ CORBA::Boolean operator>> (
         PortableServer::ServantRetentionPolicy \
       >
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 # pragma instantiate \
     TAO::Any_Basic_Impl_T< \
         PortableServer::RequestProcessingPolicyValue \
       >
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 # pragma instantiate TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>
 
 # pragma instantiate \
@@ -7942,6 +8009,8 @@ CORBA::Boolean operator>> (
         PortableServer::RequestProcessingPolicy \
       >
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 # pragma instantiate \
     TAO::Any_Basic_Impl_T< \
         PortableServer::POAManager::State \
@@ -7964,6 +8033,8 @@ CORBA::Boolean operator>> (
         PortableServer::POAManager \
       >
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 # pragma instantiate TAO::Objref_Traits<PortableServer::AdapterActivator>
 
 # pragma instantiate \
@@ -8032,6 +8103,8 @@ CORBA::Boolean operator>> (
         PortableServer::ServantLocator \
       >
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 # pragma instantiate TAO::Objref_Traits<PortableServer::Current>
 
 # pragma instantiate \
@@ -8049,4 +8122,21 @@ CORBA::Boolean operator>> (
         PortableServer::Current \
       >
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>
+
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index a3ae2e81618..d44b9caaf61 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -2929,6 +2929,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_)
 #define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_
   
@@ -2950,6 +2952,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_
   
@@ -3013,6 +3017,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_
   
@@ -3076,6 +3082,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 #if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_)
 #define _PORTABLESERVER_POAMANAGER__TRAITS_CH_
   
@@ -3097,6 +3105,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_
   
@@ -3181,6 +3191,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 #if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_)
 #define _PORTABLESERVER_CURRENT__TRAITS_CH_
  
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
index 1054dcf66ac..ed94ddd4473 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -20,6 +20,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/Object_Proxy_Broker.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once