diff options
Diffstat (limited to 'TAO/tao/default_resource.cpp')
| -rw-r--r-- | TAO/tao/default_resource.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 3986ee1e040..4f86a01f5cc 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -173,7 +173,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { TAO_Protocol_Item *item = 0; ACE_NEW_RETURN (item, - TAO_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])), + TAO_Protocol_Item (ACE_TEXT_TO_CHAR_IN(argv[curarg])), -1); if (pset->insert (item) == -1) ACE_ERROR ((LM_ERROR, @@ -329,7 +329,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (curarg < argc) { - this->add_to_ior_parser_names (ACE_TEXT_ALWAYS_CHAR(argv[curarg])); + this->add_to_ior_parser_names (ACE_TEXT_TO_CHAR_IN(argv[curarg])); } } @@ -643,7 +643,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void) ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to add ") ACE_TEXT ("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR (item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN (item->protocol_name ().c_str ()))); delete item; @@ -686,7 +686,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to load ") ACE_TEXT ("protocol <%s>, %p\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()), + ACE_TEXT_TO_TCHAR_IN(name.c_str ()), ACE_TEXT ("")), -1); } @@ -695,7 +695,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()))); + ACE_TEXT_TO_TCHAR_IN(name.c_str ()))); } } |