ChangeLogTag: Thu Jul 20 09:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 17 insertions, 4 deletions

diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
index b8c09f1d14f..bf44e0741e8 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
@@ -6,7 +6,8 @@
 
 #include "tao/Transport_Acceptor.h"
 #include "tao/MProfile.h"
-#include "tao/IIOP_Profile.h"
+#include "tao/Profile.h"
+#include "tao/Endpoint.h"
 
 ACE_RCSID(EndpointPolicy,
           Endpoint_Acceptor_Filter,
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl b/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl
index f68c5d8069a..c80b5dd90cd 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl
@@ -15,6 +15,8 @@
 ///FUZZ: disable check_for_include/
 #include "tao/EndpointPolicy/EndpointPolicy.pidl"
 
+#if !defined (TAO_LACKS_IIOP)
+
 module EndpointPolicy
 {
   local interface IIOPEndpointValue : EndpointValueBase
@@ -26,4 +28,6 @@ module EndpointPolicy
   };
 };
 
+#endif /* TAO_LACKS_IIOP */
+
 #endif /* _TAO_IIOPENDPOINT_VALUE_IDL_ */
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index 299f53bcb28..0e56b7a05de 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -1,6 +1,9 @@
 // -*- C++ -*-
 
 #include "tao/EndpointPolicy/IIOPEndpointValue_i.h"
+
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
 #include "tao/IIOP_Endpoint.h"
 #include "tao/IIOP_Acceptor.h"
 #include "ace/OS_NS_strings.h"
@@ -114,6 +117,6 @@ IIOPEndpointValue_i::protocol_tag (void)
   return IOP::TAG_INTERNET_IOP;
 }
 
-
-
 TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
index 9ad9e8989dc..3d03d1fdfe8 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
@@ -22,11 +22,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
 #include "tao/EndpointPolicy/IIOPEndpointValueC.h"
 #include "tao/EndpointPolicy/Endpoint_Value_Impl.h"
 #include "tao/LocalObject.h"
 
-
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
@@ -110,6 +113,8 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 #include /**/ "ace/post.h"
 
 #endif /* _TAO_IIOP_ENDPOINT_VALUE_I_H_ */