summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Event
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event')
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp26
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h2
10 files changed, 34 insertions, 34 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 723466ea888..d9a82b5fe5a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -115,7 +115,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[])
if (arg_shifter.is_parameter_next ())
{
- this->address_server_arg_.set (arg_shifter.get_current ());
+ this->address_server_arg_.set (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ()));
arg_shifter.consume_arg ();
}
}
@@ -166,7 +166,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[])
if (arg_shifter.is_parameter_next ())
{
- this->nic_.set (arg_shifter.get_current ());
+ this->nic_.set (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ()));
arg_shifter.consume_arg ();
}
}
@@ -315,7 +315,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
if (this->nic_.length () != 0)
{
- dgram.set_nic (this->nic_.c_str ());
+ dgram.set_nic (ACE_TEXT_TO_TCHAR_IN(this->nic_.c_str ()));
}
if (this->ttl_value_ > 0)
@@ -436,7 +436,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
handler.reset (h);
h->reactor (reactor);
- if (h->open (address_server_arg, nic) != 0)
+ if (h->open (address_server_arg, ACE_TEXT_TO_TCHAR_IN(nic)) != 0)
return TAO_ECG_Refcounted_Handler ();
}
@@ -444,7 +444,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
{
TAO_ECG_Mcast_EH * h = 0;
ACE_NEW_RETURN (h,
- TAO_ECG_Mcast_EH (receiver, nic),
+ TAO_ECG_Mcast_EH (receiver, ACE_TEXT_TO_TCHAR_IN(nic)),
handler);
handler.reset (h);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index c10cfbbb4cd..b51714d2f4b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -93,7 +93,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 +124,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 +143,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 +158,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 +177,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 +194,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 +303,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 +322,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 +334,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 +351,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 +368,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 +448,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 ();
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 93b6952aa8d..5c17293ac4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -34,7 +34,7 @@ TAO_EC_Simple_Queue_Full_Action::init_svcs (void)
}
int
-TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[])
+TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[])
{
// Here we look at the args and set an internal flag indicating whether
// the default action should be to wait for the queue to not be full
@@ -47,9 +47,9 @@ TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[])
if (argc == 0)
break;
- if (ACE_OS::strcasecmp ("wait", argv[0]) == 0)
+ if (ACE_OS::strcasecmp (ACE_TEXT("wait"), argv[0]) == 0)
this->queue_full_action_return_value_ = WAIT_TO_EMPTY;
- else if (ACE_OS::strcasecmp ("discard", argv[0]) == 0)
+ else if (ACE_OS::strcasecmp (ACE_TEXT("discard"), argv[0]) == 0)
this->queue_full_action_return_value_ = SILENTLY_DISCARD;
#if 0
else
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 7aaedd68071..370bc10524a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -65,7 +65,7 @@ public:
static int init_svcs (void);
// = The Service_Object entry points
- virtual int init (int argc, char* argv[]);
+ virtual int init (int argc, ACE_TCHAR* argv[]);
virtual int fini (void);
virtual int queue_full_action (TAO_EC_Dispatching_Task *task,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index ec6b0f935ca..89a9ddb76ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -52,7 +52,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 +60,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 +76,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 +113,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 ();
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
index 2a1c30a10a0..1fbd4a03b2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -48,7 +48,7 @@ public:
/// The Service_Object entry points.
//@{
- virtual int init (int argc, char* argv[]);
+ virtual int init (int argc, ACE_TCHAR* argv[]);
virtual int fini (void);
//@}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 087ffc53b03..4e96a5ce513 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -23,7 +23,7 @@ TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory (void)
int
-TAO_EC_RTCORBA_Factory::init (int argc, char* argv[])
+TAO_EC_RTCORBA_Factory::init (int argc, ACE_TCHAR* argv[])
{
return this->body_->init (argc, argv);
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
index a76bc59f73d..c85724ed43b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
@@ -46,7 +46,7 @@ public:
virtual ~TAO_EC_RTCORBA_Factory (void);
// Decorated methods...
- virtual int init (int argc, char* argv[]);
+ virtual int init (int argc, ACE_TCHAR* argv[]);
virtual int fini (void);
virtual TAO_EC_Dispatching*
create_dispatching (TAO_EC_Event_Channel_Base*);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index c8e822ed5b9..ab1cc0a43f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -36,15 +36,15 @@ TAO_EC_TPC_Factory::init_svcs (void)
}
int
-TAO_EC_TPC_Factory::init (int argc, char* argv[])
+TAO_EC_TPC_Factory::init (int argc, ACE_TCHAR* argv[])
{
ACE_Arg_Shifter arg_shifter (argc, 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, "-ECDispatching") == 0)
+ if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatching")) == 0)
{
arg_shifter.consume_arg ();
@@ -60,7 +60,7 @@ TAO_EC_TPC_Factory::init (int argc, char* argv[])
arg_shifter.consume_arg ();
}
}
- if (ACE_OS::strcasecmp (arg, "-ECTPCDebug") == 0)
+ if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECTPCDebug")) == 0)
{
arg_shifter.consume_arg ();
++EC_TPC_debug_level;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
index c65e5be61cc..6b17d72660f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
@@ -43,7 +43,7 @@ public:
static int init_svcs (void);
// = The Service_Object entry points
- virtual int init (int argc, char* argv[]);
+ virtual int init (int argc, ACE_TCHAR* argv[]);
// = The EC_Factory methods
virtual TAO_EC_Dispatching*
View Lorry Controller Status