diff options
Diffstat (limited to 'ace/DLL_Manager.cpp')
| -rw-r--r-- | ace/DLL_Manager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp index 02986399cfc..7d308fbf10e 100644 --- a/ace/DLL_Manager.cpp +++ b/ace/DLL_Manager.cpp @@ -7,12 +7,12 @@ #include "ace/ACE.h" #include "ace/Framework_Component.h" -#include "ace/OS.h" #include "ace/Lib_Find.h" #include "ace/Object_Manager.h" #include "ace/SString.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Guard_T.h" +#include "ace/OS_NS_dlfcn.h" ACE_RCSID (ace, DLL_Manager, @@ -59,7 +59,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (this->dll_name_) { // Once dll_name_ has been set, it can't be changed.. - if (ACE_OS_String::strcmp (this->dll_name_, dll_name) != 0) + if (ACE_OS::strcmp (this->dll_name_, dll_name) != 0) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, @@ -106,9 +106,9 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, // AIX often puts the shared library file (most often named shr.o) // inside an archive library. If this is an archive library // name, then try appending [shr.o] and retry. - if (0 != ACE_OS_String::strstr (dll_pathname, ACE_LIB_TEXT (".a"))) + if (0 != ACE_OS::strstr (dll_pathname, ACE_LIB_TEXT (".a"))) { - ACE_OS_String::strcat (dll_pathname, ACE_LIB_TEXT ("(shr.o)")); + ACE_OS::strcat (dll_pathname, ACE_LIB_TEXT ("(shr.o)")); open_mode |= RTLD_MEMBER; this->handle_ = ACE_OS::dlopen (dll_pathname, open_mode); } @@ -471,7 +471,7 @@ ACE_DLL_Manager::find_dll (const ACE_TCHAR *dll_name) const int i; for (i = 0; i < this->current_size_; i++) if (this->handle_vector_[i] && - ACE_OS_String::strcmp (this->handle_vector_[i]->dll_name (), dll_name) == 0) + ACE_OS::strcmp (this->handle_vector_[i]->dll_name (), dll_name) == 0) { return this->handle_vector_[i]; } |