diff options
Diffstat (limited to 'TAO/tao/ORB.cpp')
| -rw-r--r-- | TAO/tao/ORB.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index e25baaaa44a..98bb700a342 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -190,7 +190,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("CORBA::ORB::destroy() called on ORB <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->orb_core ()->orbid ()))); + ACE_TEXT_TO_TCHAR_IN (this->orb_core ()->orbid ()))); } this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1422,7 +1422,7 @@ CORBA::ORB_init (int &argc, if (arg_shifter.is_parameter_next ()) { orbid_string = - ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ()); + ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ()); arg_shifter.consume_arg (); } } @@ -1434,9 +1434,9 @@ CORBA::ORB_init (int &argc, // but we should skip an optional space... if (current_arg[orbid_len] == ' ') orbid_string = - ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len + 1); + ACE_TEXT_TO_CHAR_IN (current_arg + orbid_len + 1); else - orbid_string = ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len); + orbid_string = ACE_TEXT_TO_CHAR_IN (current_arg + orbid_len); } else arg_shifter.ignore_arg (); @@ -1555,7 +1555,7 @@ CORBA::ORB_init (int &argc, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) created new ORB <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (orbid_string.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (orbid_string.c_str ()))); } // Before returning remember to store the ORB into the table... |