diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/EndpointPolicy.mpc | 2 | ||||
| -rw-r--r-- | TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl | 4 | ||||
| -rw-r--r-- | TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h | 7 | ||||
| -rw-r--r-- | TAO/tao/IIOP.pidl | 3 | ||||
| -rw-r--r-- | TAO/tao/tao.mpc | 2 |
8 files changed, 30 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 966b52c9ffb..916d1becb20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Jul 20 09:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/tao_no_iiop.mpb: + New feature to disable iiop in TAO + + * bin/MakeProjectCreator/config/global.features: + Set tao_no_iiop to 0 by default + Thu Jul 20 09:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_Thread.h: diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc index 6b00640f483..c55efd44c24 100644 --- a/TAO/tao/EndpointPolicy.mpc +++ b/TAO/tao/EndpointPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core, portableserver, pi, tao_versioning_idl_defaults { +project : taolib, core, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop { sharedname = TAO_EndpointPolicy dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL 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_ */ diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl index 988a746534d..9a6762f5228 100644 --- a/TAO/tao/IIOP.pidl +++ b/TAO/tao/IIOP.pidl @@ -29,6 +29,7 @@ // complicated we may want to have them here. #pragma prefix "omg.org" +#if !defined (TAO_LACKS_IIOP) module IIOP { @@ -46,4 +47,6 @@ module IIOP }; }; +#endif /* TAO_LACKS_IIOP */ + #endif /* TAO_IIOP_PIDL */ diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 7aa50efaa6a..fc0b5ee650d 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -1,6 +1,6 @@ //$Id$ -project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_versioning_idl_defaults, corba_e_micro, corba_e_compact, core_minimum_corba { +project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_versioning_idl_defaults, corba_e_micro, corba_e_compact, core_minimum_corba, tao_no_iiop { sharedname = TAO dynamicflags = TAO_BUILD_DLL |