diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
| commit | 4aa7ae5129a9cb66f5ea26165310e96603af576c (patch) | |
| tree | f8ee6859ad547b59cc28eadb1212f403f51dfff7 /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | Do not initialize OpenSSL locks if already done by other library. (diff) | |
| download | ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.bz2 ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.xz ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.zip | |
Move StringConverter API to namespace Ice
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 75985b6ab06..8cb221fbfce 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -9,7 +9,7 @@ #include <Ice/DynamicLibrary.h> #include <IceUtil/StringUtil.h> -#include <IceUtil/StringConverter.h> +#include <Ice/StringConverter.h> #ifndef _WIN32 # include <dlfcn.h> @@ -214,9 +214,9 @@ IceInternal::DynamicLibrary::load(const string& lib) // to Windows API. // #ifdef ICE_OS_WINRT - _hnd = LoadPackagedLibrary(IceUtil::stringToWstring(lib, IceUtil::getProcessStringConverter()).c_str(), 0); + _hnd = LoadPackagedLibrary(stringToWstring(lib, getProcessStringConverter()).c_str(), 0); #elif defined(_WIN32) - _hnd = LoadLibraryW(IceUtil::stringToWstring(lib, IceUtil::getProcessStringConverter()).c_str()); + _hnd = LoadLibraryW(stringToWstring(lib, getProcessStringConverter()).c_str()); #else int flags = RTLD_NOW | RTLD_GLOBAL; |