diff options
Diffstat (limited to 'ace/Parse_Node.cpp')
-rw-r--r-- | ace/Parse_Node.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp index a2fbd12780f..da2bd33804d 100644 --- a/ace/Parse_Node.cpp +++ b/ace/Parse_Node.cpp @@ -457,7 +457,7 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *) this->symbol_ = (void *) ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (), - ASYS_WIDE_STRING (object_name)); + object_name); if (this->symbol_ == 0) { @@ -465,7 +465,7 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("dlsym failed for object %s\n"), - ASYS_WIDE_STRING (object_name))); + object_name)); ASYS_TCHAR *errmsg = ACE_OS::dlerror (); @@ -519,7 +519,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) // Locate the factory function <function_name> in the shared // object. - ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, this->function_name_); + char *function_name = ACE_const_cast (char *, this->function_name_); func = (void *(*)(ACE_Service_Object_Exterminator *)) ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (), @@ -558,7 +558,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ace_yyerrno++; ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), - this->function_name_), + ASYS_WIDE_STRING (this->function_name_)), 0); } } @@ -638,7 +638,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ACE_Static_Svc_Descriptor **ssdp = 0; ACE_STATIC_SVCS &svcs = *ACE_Service_Config::static_svcs (); - ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, this->function_name_); + char *function_name = ACE_const_cast (char *, this->function_name_); for (ACE_STATIC_SVCS_ITERATOR iter (svcs); iter.next (ssdp) != 0; @@ -673,7 +673,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ace_yyerrno++; ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), - this->function_name_), + ACE_WIDE_STRING (this->function_name_)), 0); } |