diff options
Diffstat (limited to 'TAO/tao/TransportCurrent/Current_Loader.cpp')
| -rw-r--r-- | TAO/tao/TransportCurrent/Current_Loader.cpp | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp index f2ff2564616..40b6dbba38f 100644 --- a/TAO/tao/TransportCurrent/Current_Loader.cpp +++ b/TAO/tao/TransportCurrent/Current_Loader.cpp @@ -16,14 +16,17 @@ #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" -#include "tao/TransportCurrent/Current_ORBInitializer.h" -#include "tao/TransportCurrent/Current_Loader.h" -#include "tao/TransportCurrent/Current_Impl.h" ACE_RCSID (TC, Current_Loader, "$Id$") +#if TAO_HAS_TRANSPORT_CURRENT == 1 + +#include "tao/TransportCurrent/Current_ORBInitializer.h" +#include "tao/TransportCurrent/Current_Loader.h" +#include "tao/TransportCurrent/Current_Impl.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -36,8 +39,6 @@ namespace TAO { } - - /// Initializes object when dynamic linking occurs. int Current_Loader::init (int, ACE_TCHAR *[]) @@ -50,13 +51,10 @@ namespace TAO (CORBA::SystemException::_tao_minor_code (TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; PortableInterceptor::ORBInitializer_var initializer (tmp); - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableInterceptor::register_orb_initializer (initializer.in ()); return 0; } @@ -68,9 +66,6 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL - - - #if defined (TAO_AS_STATIC_LIBS) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -92,10 +87,8 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (TAO_AS_STATIC_LIBS) */ - - +#endif /* defined (TAO_AS_STATIC_LIBS) */ ACE_STATIC_SVC_DEFINE (TAO_Transport_Current_Loader, ACE_TEXT ("TAO_Transport_Current_Loader"), @@ -107,3 +100,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Transport_Current_Loader, ACE_FACTORY_NAMESPACE_DEFINE (TAO_Transport_Current, TAO_Transport_Current_Loader, TAO::Transport::Current_Loader) + +#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ |