diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp | 68 |
1 files changed, 32 insertions, 36 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index c10cfbbb4cd..71b5d6d4c8d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -1,23 +1,23 @@ // $Id$ -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Reactive_Dispatching.h" -#include "orbsvcs/Event/EC_MT_Dispatching.h" -#include "orbsvcs/Event/EC_Basic_Filter_Builder.h" -#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Default_ProxySupplier.h" -#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" -#include "orbsvcs/Event/EC_Per_Supplier_Filter.h" -#include "orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/Event/EC_Null_Scheduling.h" -#include "orbsvcs/Event/EC_Group_Scheduling.h" -#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h" -#include "orbsvcs/Event/EC_Reactive_SupplierControl.h" +#include "EC_Default_Factory.h" +#include "EC_Reactive_Dispatching.h" +#include "EC_MT_Dispatching.h" +#include "EC_Basic_Filter_Builder.h" +#include "EC_Prefix_Filter_Builder.h" +#include "EC_ConsumerAdmin.h" +#include "EC_SupplierAdmin.h" +#include "EC_Default_ProxyConsumer.h" +#include "EC_Default_ProxySupplier.h" +#include "EC_Trivial_Supplier_Filter.h" +#include "EC_Per_Supplier_Filter.h" +#include "EC_ObserverStrategy.h" +#include "EC_Null_Scheduling.h" +#include "EC_Group_Scheduling.h" +#include "EC_Reactive_Timeout_Generator.h" +#include "EC_Event_Channel_Base.h" +#include "EC_Reactive_ConsumerControl.h" +#include "EC_Reactive_SupplierControl.h" #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" @@ -35,13 +35,11 @@ #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Default_Factory.i" +#include "EC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Default_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void) { } @@ -93,7 +91,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("mt")) == 0) this->dispatching_ = 1; else - this->unsupported_option_value ("-ECDispatching", opt); + this->unsupported_option_value ("-ECDispatching", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -124,7 +122,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("prefix")) == 0) this->filtering_ = 2; else - this->unsupported_option_value ("-ECFiltering", opt); + this->unsupported_option_value ("-ECFiltering", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -143,7 +141,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("per-supplier")) == 0) this->supplier_filtering_ = 1; else - this->unsupported_option_value ("-ECSupplierFilter", opt); + this->unsupported_option_value ("-ECSupplierFilter", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -158,7 +156,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->timeout_ = 0; else - this->unsupported_option_value ("-ECTimeout", opt); + this->unsupported_option_value ("-ECTimeout", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -177,7 +175,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->observer_ = 2; else - this->unsupported_option_value ("-ECObserver", opt); + this->unsupported_option_value ("-ECObserver", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -194,7 +192,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("group")) == 0) this->scheduling_ = 1; else - this->unsupported_option_value ("-ECScheduling", opt); + this->unsupported_option_value ("-ECScheduling", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -303,7 +301,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) this->consumer_lock_ = 2; else - this->unsupported_option_value ("-ECProxyConsumerLock", opt); + this->unsupported_option_value ("-ECProxyConsumerLock", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -322,7 +320,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) this->supplier_lock_ = 2; else - this->unsupported_option_value ("-ECProxySupplierLock", opt); + this->unsupported_option_value ("-ECProxySupplierLock", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -334,7 +332,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* 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 (); } } @@ -351,7 +349,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->consumer_control_ = 1; else - this->unsupported_option_value ("-ECConsumerControl", opt); + this->unsupported_option_value ("-ECConsumerControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -368,7 +366,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->supplier_control_ = 1; else - this->unsupported_option_value ("-ECSupplierControl", opt); + this->unsupported_option_value ("-ECSupplierControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -448,8 +446,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { - const char* opt = arg_shifter.get_current (); - this->queue_full_service_object_name_.set(opt); + const ACE_TCHAR* opt = arg_shifter.get_current (); + this->queue_full_service_object_name_.set (ACE_TEXT_TO_CHAR_IN (opt)); arg_shifter.consume_arg (); } } @@ -990,8 +988,6 @@ TAO_EC_Default_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) delete x; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_EC_Default_Factory, |