summaryrefslogtreecommitdiff
path: root/TAO/tao/default_client.cpp
diff options
context:
space:
mode:
authornobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-16 21:19:02 +0000
committernobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-16 21:19:02 +0000
commit40fdc8a404e75ab03b68cc62e9987cf208fd8c30 (patch)
tree37d9c4d3abe4aefd8a34ed797883dd2cd4862ca7 /TAO/tao/default_client.cpp
parentc254b281f1b9a4ca19dd0c3ee73a0654a7718909 (diff)
downloadATCD-40fdc8a404e75ab03b68cc62e9987cf208fd8c30.tar.gz
This commit was manufactured by cvs2svn to create branchtypecode-overhaul
'typecode-overhaul'.
Diffstat (limited to 'TAO/tao/default_client.cpp')
-rw-r--r--TAO/tao/default_client.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index ef6ab5c28fb..1dd4d84c1a7 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -4,7 +4,6 @@
#include "Wait_On_Read.h"
#include "Wait_On_Reactor.h"
#include "Wait_On_Leader_Follower.h"
-#include "Wait_On_LF_No_Upcall.h"
#include "Exclusive_TMS.h"
#include "Muxed_TMS.h"
#include "Blocked_Connect_Strategy.h"
@@ -109,10 +108,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
}
else if (ACE_OS::strcasecmp (argv[curarg],
- ACE_TEXT("-ORBClientConnectionHandler")) == 0
- ||
- ACE_OS::strcasecmp (argv[curarg],
- ACE_TEXT("-ORBWaitStrategy")) == 0)
+ ACE_TEXT("-ORBClientConnectionHandler")) == 0)
{
curarg++;
if (curarg < argc)
@@ -128,9 +124,6 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
else if (ACE_OS::strcasecmp (name,
ACE_TEXT("RW")) == 0)
this->wait_strategy_ = TAO_WAIT_ON_READ;
- else if (ACE_OS::strcasecmp (name,
- ACE_TEXT("MT_NOUPCALL")) == 0)
- this->wait_strategy_ = TAO_WAIT_ON_LF_NO_UPCALL;
else
this->report_option_value_error (ACE_TEXT("-ORBClientConnectionHandler"), name);
}
@@ -294,10 +287,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp
ACE_NEW_RETURN (ws,
TAO_Wait_On_Reactor (transport),
0);
- else if (this->wait_strategy_ == TAO_WAIT_ON_LF_NO_UPCALL)
- ACE_NEW_RETURN (ws,
- TAO::Wait_On_LF_No_Upcall (transport),
- 0);
else
{
// = Leader follower model.