diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-20 10:00:34 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-20 10:00:34 +0000 |
| commit | 019ad3bfff0e5e16fa7923c080afc8c34820aeec (patch) | |
| tree | 2c94f7c8d5201cd9a037374534e9f824b7ded413 | |
| parent | 8e17dd0ae6a7c154aee3928c913dfd2faa193b0f (diff) | |
| download | ATCD-019ad3bfff0e5e16fa7923c080afc8c34820aeec.tar.gz | |
Fri Mar 20 10:01:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/ZIOP/ZIOP_ORBInitializer.cpp:
* tao/ZIOP/ZIOP_Service_Context_Handler.cpp:
* tao/ZIOP/ZIOP_Service_Context_Handler.h:
Don't compile when we have no messaging
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/ZIOP/ZIOP_Service_Context_Handler.h | 4 |
4 files changed, 18 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8fe318811f6..571e5306ecd 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Mar 20 10:01:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/ZIOP/ZIOP_ORBInitializer.cpp: + * tao/ZIOP/ZIOP_Service_Context_Handler.cpp: + * tao/ZIOP/ZIOP_Service_Context_Handler.h: + Don't compile when we have no messaging + Fri Mar 20 07:01:18 UTC 2009 Olli Savia <ops@iki.fi> * tests/Xt_Stopwatch/timer.h: diff --git a/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp b/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp index 10318cf9ab7..9d9309925f3 100644 --- a/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp +++ b/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp @@ -45,11 +45,13 @@ TAO_ZIOP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) tao_info->orb_core ()->orb_params ()->stub_factory_name ("ZIOP_Stub_Factory"); ACE_Service_Config::process_directive (ace_svc_desc_TAO_ZIOP_Stub_Factory); - // Bind the service context handler for RTCORBA +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 + // Bind the service context handler for ZIOP TAO_ZIOP_Service_Context_Handler* h = 0; ACE_NEW (h, TAO_ZIOP_Service_Context_Handler()); tao_info->orb_core ()->service_context_registry ().bind (IOP::INVOCATION_POLICIES, h); +#endif } void diff --git a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp index 558aad84071..7e0ad04cfec 100644 --- a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp +++ b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp @@ -2,6 +2,8 @@ #include "tao/ZIOP/ZIOP_Service_Context_Handler.h" +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 + ACE_RCSID (ZIOP, ZIOP_Service_Context_Handler, "$Id$") @@ -121,3 +123,5 @@ TAO_ZIOP_Service_Context_Handler::generate_service_context ( } TAO_END_VERSIONED_NAMESPACE_DECL + +#endif diff --git a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.h b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.h index c7976263aa3..24b9c6a766f 100644 --- a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.h +++ b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.h @@ -21,6 +21,8 @@ #include "tao/Service_Context_Handler.h" +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 + TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ZIOP_Service_Context_Handler : @@ -39,5 +41,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL +#endif + #include /**/ "ace/post.h" #endif /* TAO_ZIOP_SERVICE_CONTEXT_HANDLER_H */ |