diff options
Diffstat (limited to 'TAO/orbsvcs/Notify_Service/Notify_Service.cpp')
-rw-r--r-- | TAO/orbsvcs/Notify_Service/Notify_Service.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index e7d95c4dd99..781bb0851b1 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -35,8 +35,8 @@ TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void) } int -TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL) +TAO_Notify_Service_Driver::init_ORB (int& argc, char *argv [] + ACE_ENV_ARG_DECL) { // Copy command line parameter. ACE_Argv_Type_Converter command_line(argc, argv); @@ -76,11 +76,13 @@ int TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) { + ACE_Argv_Type_Converter convert (argc, argv); + if (this->parse_args(argc, argv) != 0) return -1; // initalize the ORB. - if (this->init_ORB (argc, argv + if (this->init_ORB (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) != 0) return -1; @@ -315,7 +317,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) { if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory")))) { - this->notify_factory_name_.set (ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->notify_factory_name_.set (ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Boot")) == 0) @@ -350,7 +352,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName")))) { - this->notify_channel_name_.set(ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->notify_channel_name_.set(ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Channel")) == 0) @@ -417,7 +419,7 @@ Worker::svc (void) // just disabling it altogether. It doesn't provide much value, and // makes service startup needlessly more verbose. See bugzilla 2477 // for details. - + ACE_hthread_t current; ACE_Thread::self (current); |