diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-16 20:15:25 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-16 20:15:25 +0000 |
| commit | abe3e4573eaf9e98a283cdc1326e9b645db010f9 (patch) | |
| tree | 9d6733547f5f42ea89ded14110c3d1ae1e61d484 /TAO/tao/default_client.cpp | |
| parent | 43eb1b4028726e408e0926f4181423d474d6d583 (diff) | |
| download | ATCD-abe3e4573eaf9e98a283cdc1326e9b645db010f9.tar.gz | |
ChangeLogTag:Fri Jun 16 12:07:39 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/tao/default_client.cpp')
| -rw-r--r-- | TAO/tao/default_client.cpp | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index e4c912af861..e74d39d8fa8 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -2,8 +2,11 @@ #include "tao/default_client.h" #include "tao/ORB_Core.h" -#include "tao/Wait_Strategy.h" -#include "tao/Transport_Mux_Strategy.h" +#include "tao/Wait_On_Read.h" +#include "tao/Wait_On_Reactor.h" +#include "tao/Wait_On_Leader_Follower.h" +#include "tao/Exclusive_TMS.h" +#include "tao/Muxed_TMS.h" #if !defined (__ACE_INLINE__) # include "tao/default_client.i" @@ -27,14 +30,6 @@ TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) #else this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS; #endif /* TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY */ - -// #if defined (TAO_USE_WAIT_ON_READ) -// this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER; -// #elif defined (TAO_USE_WAIT_ON_REACTOR) -// this->wait_strategy_ = TAO_WAIT_ON_REACTOR; -// #else -// this->wait_strategy_ = TAO_WAIT_ON_READ; -// #endif /* TAO_USE_WAIT_ON_LEADER_FOLLOWER */ } TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory (void) @@ -208,14 +203,9 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp { // = Leader follower model. - if (this->transport_mux_strategy_ == TAO_EXCLUSIVE_TMS) - ACE_NEW_RETURN (ws, - TAO_Exclusive_Wait_On_Leader_Follower (transport), - 0); - else - ACE_NEW_RETURN (ws, - TAO_Muxed_Wait_On_Leader_Follower (transport), - 0); + ACE_NEW_RETURN (ws, + TAO_Wait_On_Leader_Follower (transport), + 0); } return ws; |