diff options
49 files changed, 216 insertions, 156 deletions
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 71ebea0882b..8663c1118c3 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -3,6 +3,9 @@ */ //@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START #include "tao/IIOP_Acceptor.h" + +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/IIOP_Profile.h" #include "tao/MProfile.h" #include "tao/debug.h" @@ -24,7 +27,6 @@ ACE_RCSID (tao, IIOP_Acceptor, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag) @@ -1190,4 +1192,6 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + //@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index 96103c44a22..01aea0b40de 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -19,19 +19,23 @@ #define TAO_IIOP_ACCEPTOR_H #include /**/ "ace/pre.h" -#include "ace/Acceptor.h" + +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SOCK_Acceptor.h" +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) #include "tao/Transport_Acceptor.h" #include "tao/IIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" +#include "ace/SOCK_Acceptor.h" +#include "ace/Acceptor.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -259,5 +263,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/IIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + #include /**/ "ace/post.h" #endif /* TAO_IIOP_ACCEPTOR_H */ diff --git a/TAO/tao/IIOP_Acceptor.i b/TAO/tao/IIOP_Acceptor.i index baeaba0a476..949d67653be 100644 --- a/TAO/tao/IIOP_Acceptor.i +++ b/TAO/tao/IIOP_Acceptor.i @@ -2,6 +2,8 @@ // // $Id$ +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr& @@ -38,3 +40,6 @@ TAO_IIOP_Acceptor::set_default_address (const ACE_INET_Addr& addr) } TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index e29ed3cf4d0..502797c9585 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -1,4 +1,7 @@ #include "tao/IIOP_Connection_Handler.h" + +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/IIOP_Transport.h" @@ -481,3 +484,6 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio */ TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h index bbcceb032dc..08e2b7478af 100644 --- a/TAO/tao/IIOP_Connection_Handler.h +++ b/TAO/tao/IIOP_Connection_Handler.h @@ -16,20 +16,23 @@ #include /**/ "ace/pre.h" -#include "ace/Svc_Handler.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SOCK_Stream.h" +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) #include "tao/Connection_Handler.h" #include "tao/Basic_Types.h" +#include "ace/SOCK_Stream.h" +#include "ace/Svc_Handler.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// Service Handler for this transport +/// Service Handler for this transport typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> TAO_IIOP_SVC_HANDLER; @@ -133,5 +136,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + #include /**/ "ace/post.h" #endif /* TAO_IIOP_CONNECTION_HANDLER_H */ diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 802cdc97241..793fd0f7859 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -1,4 +1,7 @@ #include "tao/IIOP_Connector.h" + +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/IIOP_Profile.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -13,7 +16,6 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" - ACE_RCSID (tao, IIOP_Connector, "$Id$") @@ -400,3 +402,5 @@ TAO_IIOP_Connector::cancel_svc_handler ( //@@ TAO_CONNECTOR_SPL_COPY_HOOK_END TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index ce75430c44f..f465814dbc6 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -19,16 +19,20 @@ #define TAO_IIOP_CONNECTOR_H #include /**/ "ace/pre.h" -#include "ace/SOCK_Connector.h" + +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/Transport_Connector.h" #include "tao/Connector_Impl.h" #include "tao/IIOP_Connection_Handler.h" +#include "ace/SOCK_Connector.h" #include "ace/Connector.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -132,5 +136,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + #include /**/ "ace/post.h" #endif /* TAO_IIOP_CONNECTOR_H */ diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index 5f5600ba676..2ca751b4ba2 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -5,6 +5,9 @@ //@@ TAO_ENDPOINT_SPL_COPY_HOOK_START #include "tao/IIOP_Endpoint.h" + +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/IOP_IORC.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -516,3 +519,5 @@ TAO_IIOP_Endpoint::preferred_network (void) const //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h index 4c8c1bfd218..73fda040cd1 100644 --- a/TAO/tao/IIOP_Endpoint.h +++ b/TAO/tao/IIOP_Endpoint.h @@ -17,14 +17,17 @@ #include /**/ "ace/pre.h" -#include "tao/Endpoint.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/CORBA_String.h" #include "tao/IIOP_EndpointsC.h" +#include "tao/Endpoint.h" #include "ace/INET_Addr.h" @@ -198,5 +201,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/IIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + #include /**/ "ace/post.h" #endif /* TAO_IIOP_PROFILE_H */ diff --git a/TAO/tao/IIOP_Endpoint.i b/TAO/tao/IIOP_Endpoint.i index e576613fdcd..c98e79c652c 100644 --- a/TAO/tao/IIOP_Endpoint.i +++ b/TAO/tao/IIOP_Endpoint.i @@ -2,6 +2,8 @@ // // $Id$ +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * @@ -31,3 +33,5 @@ TAO_IIOP_Endpoint::is_ipv6_decimal (void) const #endif /* ACE_HAS_IPV6 */ TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp index 041377b6051..3ba32da5e0a 100644 --- a/TAO/tao/IIOP_Factory.cpp +++ b/TAO/tao/IIOP_Factory.cpp @@ -1,11 +1,12 @@ #include "tao/IIOP_Factory.h" + +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/IIOP_Acceptor.h" #include "tao/IIOP_Connector.h" #include "tao/IOP_IORC.h" - #include "ace/OS_NS_strings.h" - ACE_RCSID (tao, IIOP_Factory, "$Id$") @@ -92,3 +93,5 @@ ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory, 0) ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Protocol_Factory) + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h index d7302fd08c3..01acb9ea572 100644 --- a/TAO/tao/IIOP_Factory.h +++ b/TAO/tao/IIOP_Factory.h @@ -15,13 +15,17 @@ #define TAO_IIOP_FACTORY_H #include /**/ "ace/pre.h" -#include "ace/Service_Config.h" + +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/Protocol_Factory.h" +#include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -65,5 +69,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory) +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + #include /**/ "ace/post.h" #endif /* TAO_IIOP_FACTORY_H */ diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp index 5abca44ca67..57ddb594910 100644 --- a/TAO/tao/IIOP_Lite_Factory.cpp +++ b/TAO/tao/IIOP_Lite_Factory.cpp @@ -1,11 +1,12 @@ #include "tao/IIOP_Lite_Factory.h" + +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/IIOP_Acceptor.h" #include "tao/IIOP_Connector.h" #include "tao/IOP_IORC.h" - #include "ace/OS_NS_strings.h" - ACE_RCSID (tao, IIOP_Factory, "$Id$") @@ -98,3 +99,5 @@ ACE_STATIC_SVC_DEFINE (TAO_IIOP_Lite_Protocol_Factory, 0) ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Lite_Protocol_Factory) + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h index c1f7cc876dd..2b0141b4d55 100644 --- a/TAO/tao/IIOP_Lite_Factory.h +++ b/TAO/tao/IIOP_Lite_Factory.h @@ -15,13 +15,17 @@ #define TAO_IIOP_LITE_FACTORY_H #include /**/ "ace/pre.h" -#include "ace/Service_Config.h" + +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/Protocol_Factory.h" +#include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -67,5 +71,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Lite_Protocol_Factory) ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Lite_Protocol_Factory) +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + #include /**/ "ace/post.h" #endif /* TAO_IIOP_Lite_factory_H */ diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 2fe913d2108..93bc39cbd7d 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -1,4 +1,7 @@ #include "tao/IIOP_Profile.h" + +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/Environment.h" #include "tao/ORB_Core.h" #include "tao/debug.h" @@ -748,3 +751,5 @@ TAO_IIOP_Profile::decode_endpoints (void) //@@ TAO_PROFILE_SPL_COPY_HOOK_END TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index a7d52bbc467..4c338cbc664 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -18,12 +18,15 @@ #include /**/ "ace/pre.h" -#include "tao/Profile.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + +#include "tao/Profile.h" #include "tao/IIOP_Endpoint.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -171,6 +174,8 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + #include /**/ "ace/post.h" #endif /* TAO_IIOP_PROFILE_H */ diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 6719491a92d..d7e493e7402 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -1,4 +1,7 @@ #include "tao/IIOP_Transport.h" + +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + #include "tao/IIOP_Acceptor.h" #include "tao/IIOPC.h" #include "tao/Acceptor_Registry.h" @@ -426,3 +429,5 @@ TAO_IIOP_Transport::get_listen_point ( */ TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 2e094054834..e64641d1aa6 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -16,12 +16,16 @@ #include /**/ "ace/pre.h" -#include "tao/Transport.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) + +#include "tao/Transport.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace IIOP @@ -149,6 +153,8 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + #include /**/ "ace/post.h" #endif /* TAO_IIOP_TRANSPORT_H */ diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 45eebeee97f..736ffd89b61 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -9,8 +9,7 @@ #include "tao/ORB_Core_TSS_Resources.h" #include "tao/TAO_Server_Request.h" #include "tao/Transport.h" -#include "tao/IIOP_Transport.h" -#include "tao/IIOP_Connection_Handler.h" +#include "tao/Connection_Handler.h" #include "tao/Service_Context.h" #include "tao/Protocols_Hooks.h" #include "tao/debug.h" diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index 0de8b911e3d..3c26ee92350 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -20,12 +20,12 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) + #include "tao/Transport_Acceptor.h" #include "tao/Strategies/DIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h index 74c8702113a..f2b4218bad5 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h @@ -17,22 +17,19 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) - -#include "ace/Reactor.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Acceptor.h" +#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) +#include "tao/Strategies/strategies_export.h" #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" #include "tao/Strategies/DIOP_Transport.h" #include "ace/SOCK_Dgram.h" -#include "tao/Strategies/strategies_export.h" - +#include "ace/Reactor.h" +#include "ace/Acceptor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index d1f8e139fbe..e8719677bf6 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -19,15 +19,15 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) - -#include "tao/Transport_Connector.h" -#include "tao/Strategies/DIOP_Connection_Handler.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) + +#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "tao/Transport_Connector.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Endpoint; diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index a654c95e94a..a541a954488 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -16,18 +16,19 @@ #ifndef TAO_DIOP_ENDPOINT_H #define TAO_DIOP_ENDPOINT_H #include /**/ "ace/pre.h" -#include "tao/Endpoint.h" - - -#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) + +#include "tao/Strategies/strategies_export.h" +#include "tao/Endpoint.h" #include "tao/CORBA_String.h" #include "ace/INET_Addr.h" -#include "tao/Strategies/strategies_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index 6add2587345..011900bb655 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -18,16 +18,15 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) - -#include "tao/Protocol_Factory.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Config.h" +#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) + #include "tao/Strategies/strategies_export.h" +#include "tao/Protocol_Factory.h" +#include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index 0458ebef6dc..f2c670042dd 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -21,13 +21,14 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) - -#include "tao/Profile.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) + #include "tao/Strategies/DIOP_Endpoint.h" +#include "tao/Profile.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index 7313639fc96..e120804d184 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// =================================================================== +//============================================================================= /** * @file DIOP_Transport.h * @@ -8,7 +8,7 @@ * * @author Michael Kircher */ -// =================================================================== +//============================================================================= #ifndef TAO_DIOP_TRANSPORT_H #define TAO_DIOP_TRANSPORT_H @@ -17,17 +17,16 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) - -#include "tao/Transport.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) + +#include "tao/Strategies/strategies_export.h" +#include "tao/Transport.h" #include "ace/SOCK_Stream.h" #include "ace/Svc_Handler.h" -#include "tao/Strategies/strategies_export.h" #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 03574aa5b2b..393e1204a71 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -87,7 +87,7 @@ TAO_SCIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key, CORBA::Short priority) { // Adding this->endpoint_count_ to the TAO_MProfile. - int count = mprofile.profile_count (); + int const count = mprofile.profile_count (); if ((mprofile.size () - count) < this->endpoint_count_ && mprofile.grow (count + this->endpoint_count_) == -1) return -1; @@ -733,7 +733,7 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) size_t lo_cnt = 0; // Loopback interface count for (size_t j = 0; j < if_cnt; ++j) if (if_addrs[j].get_ip_address () == INADDR_LOOPBACK) - lo_cnt++; + ++lo_cnt; // The instantiation for this template is in // tao/SCIOP_Connector.cpp. @@ -797,7 +797,7 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) if (this->addrs_[host_cnt].set (if_addrs[i]) != 0) return -1; - host_cnt++; + ++host_cnt; } return 0; @@ -809,7 +809,7 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames, { // Make a copy of hostnames string - int hostnames_string_length = ACE_OS::strlen(hostnames) + 1; + int const hostnames_string_length = ACE_OS::strlen(hostnames) + 1; char* hostnames_copy = 0; ACE_NEW_RETURN (hostnames_copy, char[hostnames_string_length], diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index f81492115c2..ce00d346db4 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -9,9 +9,6 @@ * * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> * @author Keith O'Hara, Lockheed Martin ATL - * @author based on IIOP_Acceptor, Originally by - * @author Fred Kuhns <fredk@cs.wustl.edu> - * @author Ossama Othman <ossama@uci.edu> */ // =================================================================== @@ -19,7 +16,6 @@ #ifndef TAO_SCIOP_ACCEPTOR_H #define TAO_SCIOP_ACCEPTOR_H #include /**/ "ace/pre.h" -#include "ace/Acceptor.h" #include "tao/orbconf.h" @@ -29,13 +25,14 @@ #if TAO_HAS_SCIOP == 1 -#include "ace/SOCK_SEQPACK_Acceptor.h" - #include "tao/Transport_Acceptor.h" #include "tao/Strategies/SCIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" +#include "ace/SOCK_SEQPACK_Acceptor.h" +#include "ace/Acceptor.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO SCIOP_Acceptor concrete call defination diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index 932a4e6b575..dd83f2fac6e 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -231,7 +231,7 @@ TAO_SCIOP_Connection_Handler::handle_input (ACE_HANDLE h) int TAO_SCIOP_Connection_Handler::handle_output (ACE_HANDLE handle) { - int result = + int const result = this->handle_output_eh (handle, this); if (result == -1) @@ -304,7 +304,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list ( IIOP::ListenPointList &listen_list) { // Get the size of the list - CORBA::ULong len = listen_list.length (); + CORBA::ULong const len = listen_list.length (); for (CORBA::ULong i = 0; i < len; ++ i) { @@ -332,7 +332,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list ( // The property for this handler has changed. Recache the // handler with this property - int retval = this->transport ()->recache_transport (&prop); + int const retval = this->transport ()->recache_transport (&prop); if (retval == -1) return retval; @@ -361,10 +361,10 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri if (tos != this->dscp_codepoint_) { - int result = this->peer ().set_option (IPPROTO_IP, - IP_TOS, - (int *) &tos , - (int) sizeof (tos)); + int const result = this->peer ().set_option (IPPROTO_IP, + IP_TOS, + (int *) &tos , + (int) sizeof (tos)); if (TAO_debug_level) { diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h index 9cfe605b80f..2a43c03057c 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h @@ -7,9 +7,6 @@ * * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> * @author Keith O'Hara, Lockheed Martin ATL - * @author based on IIOP_Connection_Handler.h - * @author Originally by Chris Cleeland - * @author modified by Balachandran Natarajan <bala@cs.wustl.edu> */ // =================================================================== @@ -19,9 +16,6 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" -#include "tao/TimeBaseC.h" - -#include "ace/Reactor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -32,7 +26,9 @@ #include "tao/Strategies/strategies_export.h" #include "tao/Connection_Handler.h" #include "tao/IIOPC.h" +#include "tao/TimeBaseC.h" +#include "ace/Reactor.h" #include "ace/Svc_Handler.h" #include "ace/SOCK_SEQPACK_Association.h" diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index 8431309099a..283afe00b19 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -9,20 +9,14 @@ * * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> * @author Keith O'Hara, Lockheed Martin ATL - * @author based on IIOP_Connector by - * @author Fred Kuhns <fredk@cs.wustl.edu> - * @author Ossama Othman <ossama@uci.edu> - * @author Balachandran Natarajan <bala@cs.wustl.edu> */ //============================================================================= - #ifndef TAO_SCIOP_CONNECTOR_H #define TAO_SCIOP_CONNECTOR_H #include /**/ "ace/pre.h" #include "tao/orbconf.h" -#include "ace/SOCK_SEQPACK_Connector.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,10 +24,11 @@ #if TAO_HAS_SCIOP == 1 -#include "ace/Connector.h" #include "tao/Transport_Connector.h" #include "tao/Connector_Impl.h" #include "tao/Strategies/SCIOP_Connection_Handler.h" +#include "ace/SOCK_SEQPACK_Connector.h" +#include "ace/Connector.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index 483d0206c36..7772b4f4a0c 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -10,8 +10,6 @@ * * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> * @author Keith O'Hara, Lockheed Martin ATL - * @author based on IIOP_Endpoint by - * @author Marina Spivak <marina@cs.wustl.edu> */ //========================================================================== diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h index a81198ab706..d0b1fc489fa 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Factory.h @@ -7,8 +7,6 @@ * * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> * @author Keith O'Hara, Lockheed Martin ATL - * @author based on IIOP_Factory by - * @author Fred Kuhns <fredk@cs.wustl.edu> */ //============================================================================= diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h index c4e05a13bb9..7c9dbd4d181 100644 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h @@ -7,8 +7,6 @@ * * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> * @author Keith O'Hara, Lockheed Martin ATL - * @author based on IIOP_Lite_Factory by - * @author Fred Kuhns <fredk@cs.wustl.edu> */ //========================================================================== diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index c2abcf93a1b..4bfc18ebb6a 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -8,8 +8,6 @@ * * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> * @author Keith O'Hara, Lockheed Martin ATL - * @author based on IIOP_Profile by - * @author Fred Kuhns <fredk@cs.wustl.edu> */ //============================================================================= @@ -19,7 +17,8 @@ #include /**/ "ace/pre.h" -#include "tao/Profile.h" +#include "tao/orbconf.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -27,6 +26,7 @@ #if TAO_HAS_SCIOP == 1 #include "tao/Strategies/SCIOP_Endpoint.h" +#include "tao/Profile.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index ad07a706b64..c99b24aa10d 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -7,9 +7,6 @@ * * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> * @author Keith O'Hara, Lockheed Martin ATL - * @author based on IIOP_Transport - * @author Originally by Fred Kuhns <fredk@cs.wustl.edu> - * @author Modified by Balachandran Natarajan <bala@cs.wustl.edu> */ // =================================================================== @@ -17,7 +14,7 @@ #define TAO_SCIOP_TRANSPORT_H #include /**/ "ace/pre.h" -#include "tao/Transport.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,6 +23,7 @@ #if TAO_HAS_SCIOP == 1 #include "tao/Strategies/strategies_export.h" +#include "tao/Transport.h" #include "tao/IIOPC.h" #include "ace/SOCK_SEQPACK_Association.h" diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h index b1db53fd947..61e8d25f90c 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.h +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h @@ -1,21 +1,16 @@ // -*- C++ -*- // $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// SHMIOP_Acceptor.h -// -// = DESCRIPTION -// SHMIOP specific acceptor processing -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ +// $Id$ +// =================================================================== +/** + * @file SHMIOP_Acceptor.h + * + * @brief SHMIOP specific acceptor processing + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +// =================================================================== #ifndef TAO_SHMIOP_ACCEPTOR_H #define TAO_SHMIOP_ACCEPTOR_H diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index 626c424920b..8b432e5750f 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h @@ -6,8 +6,7 @@ * * $Id$ * - * @author Originally by Nanbor Wang <nanbor@cs.wustl.edu> as UIOP_Connect.h - * @author modified by Balachandran Natarajan <bala@cs.wustl.edu> + * @author Nanbor Wang <nanbor@cs.wustl.edu> */ // =================================================================== diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index 95c1ef4a2f7..96776801b1e 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -8,7 +8,6 @@ * * SHMIOP specific connector processing * - * * @author Nanbor Wang <nanbor@cs.wustl.edu> */ //============================================================================= diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h index bd5b24ffb14..e48e208443f 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.h +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h @@ -8,7 +8,6 @@ * * SHMIOP implementation of PP Framework Endpoint interface. * - * * @author Marina Spivak <marina@cs.wustl.edu> */ //========================================================================== @@ -17,20 +16,21 @@ #define TAO_SHMIOP_ENDPOINT_H #include /**/ "ace/pre.h" -#include "tao/Endpoint.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) + #include "tao/CORBA_String.h" +#include "tao/Endpoint.h" #include "tao/Strategies/strategies_export.h" #include "ace/INET_Addr.h" #include "ace/MEM_Addr.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h index fff404e0d98..0b623455790 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.h +++ b/TAO/tao/Strategies/SHMIOP_Factory.h @@ -1,18 +1,14 @@ // -*- C++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// SHMIOP_Factory.h -// -// = AUTHOR -// Nanbor Wang <nanbor@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file SHMIOP_Factory.h + * + * $Id$ + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= #ifndef TAO_SHMIOP_FACTORY_H #define TAO_SHMIOP_FACTORY_H diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index f71d1546cb1..d75215ed4a9 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -8,7 +8,6 @@ * * SHMIOP profile specific processing * - * * @author Nanbor Wang <nanbor@cs.wustl.edu> */ //============================================================================= diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index 6c90b821c4e..e44b79d4173 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -6,8 +6,8 @@ * * $Id$ * - * @author Originally by Nanbor Wang <nanbor@cs.wustl.edu> - * @author Modified by Balachandran Natarajan <bala@cs.wustl.edu> + * @author Nanbor Wang <nanbor@cs.wustl.edu> + * @author Balachandran Natarajan <bala@cs.wustl.edu> */ // =================================================================== @@ -84,8 +84,8 @@ protected: size_t len, const ACE_Time_Value *s = 0); - virtual int handle_input (TAO_Resume_Handle &rh, - ACE_Time_Value *max_wait_time, + virtual int handle_input (TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time, int block = 0); //@} diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index c2e0078cd00..107706a82b6 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -24,15 +24,11 @@ #if TAO_HAS_UIOP == 1 -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Acceptor.h" -#include "ace/Reactor.h" +#include "tao/Strategies/UIOP_Transport.h" #include "tao/Connection_Handler.h" #include "tao/Wait_Strategy.h" -#include "tao/Strategies/UIOP_Transport.h" +#include "ace/Acceptor.h" +#include "ace/Reactor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index dfff6c2a1f2..00af4e66e50 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -16,7 +16,7 @@ #define TAO_UIOP_ENDPOINT_H #include /**/ "ace/pre.h" -#include "tao/Endpoint.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,6 +25,7 @@ # if TAO_HAS_UIOP == 1 #include "tao/Strategies/strategies_export.h" +#include "tao/Endpoint.h" #include "ace/UNIX_Addr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h index 9199095b1cc..98e127d58f7 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h @@ -22,12 +22,12 @@ #include "tao/orbconf.h" -# if TAO_HAS_UIOP == 1 - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +# if TAO_HAS_UIOP == 1 + #include "ace/Service_Config.h" #include "tao/Strategies/strategies_export.h" #include "tao/Protocol_Factory.h" diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 8cb753d3ea4..0839cc1f048 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -321,8 +321,10 @@ namespace // // where PN is the name of your protocol and LIB is the base // name of the shared library that implements the protocol. +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) ACE_Service_Config::process_directive ( ace_svc_desc_TAO_IIOP_Protocol_Factory); +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ // add descriptor to list of static objects. ACE_Service_Config::process_directive ( diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 59f2cd93332..b53e516d9ac 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "tao/IIOP_Factory.h" +#include "tao/Protocol_Factory.h" #include "tao/Acceptor_Registry.h" #include "tao/Connector_Registry.h" #include "tao/Reactive_Flushing_Strategy.h" @@ -25,7 +26,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" - ACE_RCSID (tao, default_resource, "$Id$") @@ -546,6 +546,7 @@ TAO_Default_Resource_Factory::add_to_ior_parser_names (const char *curarg) int TAO_Default_Resource_Factory::load_default_protocols (void) { +#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) // If the user did not list any protocols in her svc.conf file // then default to TAO's basic protocols. // You do *NOT* need modify this code to add your own protocol, @@ -581,7 +582,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void) // If a protocol factory is obtained from the Service // Configurator then do not transfer ownership to the // TAO_Protocol_Item. - int transfer_ownership = 0; + bool transfer_ownership = false; protocol_factory = ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("IIOP_Factory"); @@ -604,11 +605,12 @@ TAO_Default_Resource_Factory::load_default_protocols (void) protocol_factory, TAO_Protocol_Factory); - transfer_ownership = 1; + transfer_ownership = true; + } else { - transfer_ownership = 0; + transfer_ownership = false; } ACE_NEW_RETURN (item, @@ -648,6 +650,8 @@ TAO_Default_Resource_Factory::load_default_protocols (void) ACE_TEXT ("protocol <IIOP_Factory>\n"))); } +#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ + return 0; } diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index ccc3c2259a1..61cf7bfb65b 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -279,16 +279,20 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; # define TAO_HAS_MINIMUM_CORBA 0 #endif /* TAO_HAS_MINIMUM_CORBA */ -// Default DIOP settings +/// Default IIOP settings +#if !defined (TAO_HAS_IIOP) +# define TAO_HAS_IIOP 1 +#endif /* !TAO_HAS_IIOP */ + +/// Default DIOP settings #if !defined (TAO_HAS_DIOP) -# define TAO_HAS_DIOP 1 +# define TAO_HAS_DIOP 1 #endif /* !TAO_HAS_DIOP */ -// SCIOP is disabled by default (i.e. TAO_HAS_SCIOP is undef) -// to enable SCIOP, make with sctp=openss7 option on command line. -// See $ACE_ROOT/performance-tests/SCTP/README for more info. - -// Default SCIOP Settings +/// Default SCIOP Settings +/// SCIOP is disabled by default (i.e. TAO_HAS_SCIOP is undef) +/// to enable SCIOP, make with sctp=openss7 option on command line. +/// See $ACE_ROOT/performance-tests/SCTP/README for more info. #if !defined (TAO_HAS_SCIOP) # if defined (ACE_HAS_SCTP) # define TAO_HAS_SCIOP 1 |