diff options
Diffstat (limited to 'TAO/tao/default_client.cpp')
| -rw-r--r-- | TAO/tao/default_client.cpp | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index bc6d38cf6ab..e2d4b28f9d1 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "tao/default_client.h" -#include "tao/Wait_On_Read.h" -#include "tao/Wait_On_Reactor.h" -#include "tao/Wait_On_Leader_Follower.h" -#include "tao/Wait_On_LF_No_Upcall.h" -#include "tao/Exclusive_TMS.h" -#include "tao/Muxed_TMS.h" -#include "tao/Blocked_Connect_Strategy.h" -#include "tao/Reactive_Connect_Strategy.h" -#include "tao/LF_Connect_Strategy.h" -#include "tao/orbconf.h" +#include "default_client.h" +#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" +#include "Reactive_Connect_Strategy.h" +#include "LF_Connect_Strategy.h" +#include "orbconf.h" #include "ace/Lock_Adapter_T.h" #include "ace/Recursive_Thread_Mutex.h" @@ -23,8 +23,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) : profile_lock_type_ (TAO_THREAD_LOCK) , transport_mux_strategy_ (TAO_MUXED_TMS) @@ -106,8 +104,6 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (name, ACE_TEXT("null")) == 0) this->profile_lock_type_ = TAO_NULL_LOCK; - else - this->report_option_value_error (ACE_TEXT("-ORBIIOPProfileLock"), name); } } @@ -212,14 +208,9 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { ACE_TCHAR* name = argv[curarg]; - if (ACE_OS::strcmp (name, ACE_TEXT("0")) == 0 || - ACE_OS::strcasecmp (name, ACE_TEXT("false")) == 0) + if (ACE_OS::strcasecmp (name, + ACE_TEXT("false")) == 0) this->use_cleanup_options_ = false; - else if (ACE_OS::strcmp (name, ACE_TEXT("1")) == 0 || - ACE_OS::strcasecmp (name, ACE_TEXT("true")) == 0) - this->use_cleanup_options_ = true; - else - this->report_option_value_error (ACE_TEXT("-ORBConnectionHandlerCleanup"), name); } } else if (ACE_OS::strncmp (argv[curarg], ACE_TEXT("-ORB"), 4) == 0) @@ -392,8 +383,6 @@ TAO_Default_Client_Strategy_Factory::use_cleanup_options (void) const return this->use_cleanup_options_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory, |