diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-29 19:09:24 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-29 19:09:24 +0000 |
| commit | 6d3197598c15e5e0949dc3ab3cd6c773254cba0d (patch) | |
| tree | 4586072b461313b7c111f3580bb6987b12c3af99 | |
| parent | aced429ceef77137426872a185774307e3c574cb (diff) | |
| download | ATCD-6d3197598c15e5e0949dc3ab3cd6c773254cba0d.tar.gz | |
changes to the DS library
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Current.cpp | 9 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp | 5 |
3 files changed, 16 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 322041dc754..ae9b037e9d1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Jan 29 19:07:44 UTC 2007 Jaiganesh B <jai.dre.vanderbilt.edu> + + * tao/RTCORBA/RT_Current.cpp: + tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp: + + Made changes to use the right "get" protocols hooks function + to obtain the right protocols hooks piece to use. + Mon Jan 29 18:16:52 UTC 2007 Jaiganesh B <jai.dre.vanderbilt.edu> * tao/RTCORBA/RT_ORBInitializer.cpp: diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index 5c9170dd78e..0a828e92aa5 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -11,6 +11,7 @@ #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/Protocols_Hooks.h" +#include "tao/Thread_Priority_Protocols_Hooks.h" #include "ace/Thread.h" @@ -33,8 +34,8 @@ RTCORBA::Priority TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Protocols_Hooks *tph = - this->orb_core_->get_protocols_hooks (); + TAO_Thread_Priority_Protocols_Hooks *tph = + this->orb_core_->get_thread_priority_protocols_hooks (); RTCORBA::Priority priority; @@ -55,8 +56,8 @@ TAO_RT_Current::the_priority (RTCORBA::Priority the_priority ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Protocols_Hooks *tph = - this->orb_core_->get_protocols_hooks (); + TAO_Thread_Priority_Protocols_Hooks *tph = + this->orb_core_->get_thread_priority_protocols_hooks (); int result = tph->set_thread_CORBA_priority (the_priority diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index a850ca0bea8..6e4e904970e 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -8,6 +8,7 @@ #include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" #include "tao/RTCORBA/RT_Endpoint_Utils.h" #include "tao/RTCORBA/RT_Protocols_Hooks.h" +#include "tao/RTCORBA/RT_Policy_Protocols_Hooks.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/Profile.h" @@ -217,8 +218,8 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( else { // Get the protocol hooks. - TAO_Protocols_Hooks *protocol_hooks = - r.stub ()->orb_core ()->get_protocols_hooks (); + TAO_Policy_Protocols_Hooks *protocol_hooks = + r.stub ()->orb_core ()->get_policy_protocols_hooks (); CORBA::Short server_priority = 0; CORBA::Boolean is_client_propagated = 0; |