ChangeLogTag: Wed Nov 1 08:14:14 2000 Jeff Parsons <parsons@cs.wustl.edu>

16 files changed, 69 insertions, 14 deletions

diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 342208772dd..9f990d60c30 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -4,6 +4,8 @@
 
 ACE_RCSID(DynamicInterface, Context, "$Id$")
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "tao/Typecode.h"
 #include "tao/Environment.h"
 #include "tao/NVList.h"
@@ -211,3 +213,5 @@ CORBA_ContextList::_decr_refcnt (void)
     }
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 8459eb29b4d..393d1ac1604 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -27,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "dynamicinterface_export.h"
 
 class TAO_DynamicInterface_Export CORBA_Context
@@ -301,5 +303,6 @@ private:
 # include "Context.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 #include "ace/post.h"
 #endif /* TAO_CONTEXT_H */
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index a1d7a4075f9..297005d2f48 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -5,6 +5,8 @@
 
 ACE_RCSID(DynamicInterface, DII_Invocation, "$Id$")
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "tao/Stub.h"
 #include "tao/Principal.h"
 #include "tao/Object_KeyC.h"
@@ -15,7 +17,6 @@ ACE_RCSID(DynamicInterface, DII_Invocation, "$Id$")
 # include "DII_Invocation.inl"
 #endif /* ! __ACE_INLINE__ */
 
-
 void
 TAO_GIOP_DII_Deferred_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -75,3 +76,4 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
   return TAO_INVOKE_OK;
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
index a3cd1c582ab..3c9bc21e96e 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -26,6 +26,8 @@
 #  pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "DII_Reply_Dispatcher.h"
 #include "Request.h"
 
@@ -74,5 +76,6 @@ private:
 #  include "DII_Invocation.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 #include "ace/post.h"
 #endif /* TAO_ASYNCH_INVOCATION_H */
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index ff257fa4ea9..b945b665327 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -5,6 +5,8 @@
 
 ACE_RCSID(DynamicInterface, DII_Reply_Dispatcher, "$Id$")
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "Request.h"
 #include "tao/Pluggable.h"
 #include "tao/Environment.h"
@@ -128,3 +130,4 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
   ACE_ENDTRY;
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
index c9a3be4f0ce..c28e9a4a890 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -25,6 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "dynamicinterface_export.h"
 #include "tao/Reply_Dispatcher.h"
 
@@ -90,5 +92,6 @@ private:
 #  include "DII_Reply_Dispatcher.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 #include "ace/post.h"
 #endif /* TAO_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index 5e87524c347..bca16588048 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
 #include "Dynamic_Adapter_Impl.h"
+
+ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$")
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "Request.h"
 #include "Server_Request.h"
 #include "tao/Invocation.h"
 
-ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$")
-
 TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl (void)
 {
 }
@@ -196,3 +199,4 @@ ACE_STATIC_SVC_DEFINE (
 
 ACE_FACTORY_DEFINE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl)
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index 4503c0204e8..ddf5b4225f0 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -21,14 +21,17 @@
 #define TAO_DYNAMIC_ADAPTER_IMPL_H
 #include "ace/pre.h"
 
-#include "dynamicinterface_export.h"
 #include "tao/Dynamic_Adapter.h"
-#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
+#include "dynamicinterface_export.h"
+#include "ace/Service_Config.h"
+
 class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl 
   : public TAO_Dynamic_Adapter
 {
@@ -118,5 +121,6 @@ TAO_Requires_Request_Factory_Initializer =
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 #include "ace/post.h"
 #endif /* TAO_DYNAMIC_ADAPTER_IMPL_H */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 83c8003d8ab..1c5878ef50c 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
 #include "Dynamic_Implementation.h"
+
+ACE_RCSID(DynamicInterface, Dynamic_Implementation, "$Id$")
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/PortableServer/POA.h"
 #include "tao/PortableServer/Collocated_Object.h"
 
-ACE_RCSID(DynamicInterface, Dynamic_Implementation, "$Id$")
-
 CORBA::Object_ptr
 TAO_DynamicImplementation::_this (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -135,3 +138,4 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
    CORBA::release (dsi_request);
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 810245bbbd5..72fca2d9bf1 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -27,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "dynamicinterface_export.h"
 
 class TAO_DynamicInterface_Export TAO_DynamicImplementation 
@@ -81,5 +83,6 @@ protected:
   // Turns around and calls invoke.
 };
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 #include "ace/post.h"
 #endif /* TAO_DYNAMIC_IMPLEMENTATION_H */
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index dfe4bace7a4..59515de1192 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -1,6 +1,11 @@
 // $Id$
 
 #include "ExceptionList.h"
+
+ACE_RCSID(DynamicInterface, ExceptionList, "$Id$")
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "tao/Typecode.h"
 #include "tao/Environment.h"
 
@@ -8,8 +13,6 @@
 # include "ExceptionList.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(DynamicInterface, ExceptionList, "$Id$")
-
 CORBA_ExceptionList::CORBA_ExceptionList (CORBA::ULong len,
                                           CORBA::TypeCode_ptr *tc_list)
   : ref_count_ (1)
@@ -117,3 +120,4 @@ template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>;
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index 9a8f3e3f969..dbf8a293422 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -29,6 +29,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "dynamicinterface_export.h"
 
 class CORBA_ExceptionList;
@@ -147,6 +149,7 @@ private:
 # include "ExceptionList.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 #include "ace/post.h"
 #endif /* TAO_CORBA_EXCEPTIONLIST_H */
 
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 9837a2e52fc..1d5af62d3fe 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -1,6 +1,11 @@
 // $Id$
 
 #include "Request.h"
+
+ACE_RCSID(DynamicInterface, Request, "$Id$")
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "ExceptionList.h"
 #include "DII_Invocation.h"
 #include "tao/Object.h"
@@ -9,9 +14,7 @@
 # include "Request.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(DynamicInterface, Request, "$Id$")
-
-// Reference counting for DII Request object
+// Reference counting for DII Request object.
 
 CORBA::ULong
 CORBA_Request::_incr_refcnt (void)
@@ -426,3 +429,4 @@ template class TAO_Pseudo_Object_Manager<CORBA_Request,CORBA_Request_var>;
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 286b5ef4be6..34bd4279346 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -29,6 +29,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "Context.h"
 #include "ExceptionList.h"
 #include "tao/corbafwd.h"
@@ -367,5 +369,6 @@ private:
 # include "Request.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 #include "ace/post.h"
 #endif /* TAO_REQUEST_H */
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 00153434621..22bdd65cf02 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -3,6 +3,11 @@
 // Implementation of the Dynamic Server Skeleton Interface.
 
 #include "Server_Request.h"
+
+ACE_RCSID(DynamicInterface, Server_Request, "$Id$")
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "tao/NVList.h"
 #include "tao/GIOP_Utils.h"
 #include "tao/Marshal.h"
@@ -11,8 +16,6 @@
 # include "Server_Request.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(DynamicInterface, Server_Request, "$Id$")
-
 // Reference counting for DSI ServerRequest object.
 
 CORBA::ULong
@@ -204,3 +207,5 @@ CORBA_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
     }
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 3efb9a7d1aa..56ddfcccba6 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -28,6 +28,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #include "Context.h"
 #include "tao/TAO_Server_Request.h"
 
@@ -141,5 +143,6 @@ private:
 # include "Server_Request.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 #include "ace/post.h"
 #endif /* TAO_CORBA_SERVER_REQUEST_H */