diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index ec6b0f935ca..4cc2098d2b8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -8,22 +8,20 @@ #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" -#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" -#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h" -#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "ECG_ConsumerEC_Control.h" +#include "ECG_Reactive_ConsumerEC_Control.h" +#include "ECG_Reconnect_ConsumerEC_Control.h" +#include "EC_Gateway_IIOP.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i" +#include "EC_Gateway_IIOP_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_Gateway_IIOP_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_EC_Gateway_IIOP_Factory::init_svcs (void) { @@ -52,7 +50,7 @@ TAO_EC_Gateway_IIOP_Factory::fini (void) } int -TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) +TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[]) { int result = 0; @@ -60,7 +58,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) while (arg_shifter.is_anything_left ()) { - const char *arg = arg_shifter.get_current (); + const ACE_TCHAR *arg = arg_shifter.get_current (); if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPConsumerECControl")) == 0) { @@ -76,7 +74,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reconnect")) == 0) this->consumer_ec_control_ = 2; else - this->unsupported_option_value ("-ECGIIOPConsumerECControl", opt); + this->unsupported_option_value ("-ECGIIOPConsumerECControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -113,7 +111,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) if (arg_shifter.is_parameter_next ()) { // Save argument for later use - this->orbid_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ()); + this->orbid_ = ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ()); arg_shifter.consume_arg (); } } @@ -201,8 +199,6 @@ TAO_EC_Gateway_IIOP_Factory::destroy_consumerec_control ( delete x; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_EC_Gateway_IIOP_Factory, ACE_TEXT ("EC_Gateway_IIOP_Factory"), ACE_SVC_OBJ_T, |