From 053c21a38a51ebdb5e90ebfdd29c0736e35f1233 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 7 Sep 2018 11:40:44 +0300 Subject: [PATCH] Finalize windows porting --- src/GEOM_I/GEOM_Gen_i.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 715328ce0..4322605fa 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -2510,21 +2510,21 @@ void GEOM_Gen_i::LoadPlugin(const std::string& theLibName) // check, if corresponding operations are already created if (myOpCreatorMap.find(theLibName) == myOpCreatorMap.end()) { -#ifdef UNICODE - //RNV: this is workaround for providing compilation, - // path should be processed as unicode string. - size_t length = strlen(aPlatformLibName.c_str()) + sizeof(char); - wchar_t* aPath = new wchar_t[length + 1]; - memset(aPath, '\0', length); - mbstowcs(aPath, aPlatformLibName.c_str(), length); -#else - const char* aPath = xmlPath.c_str(); -#endif - // load plugin library #if WIN32 + #if UNICODE + //RNV: this is workaround for providing compilation, + // path should be processed as unicode string. + size_t length = strlen(aPlatformLibName.c_str()) + sizeof(char); + wchar_t* aPath = new wchar_t[length + 1]; + memset(aPath, '\0', length); + mbstowcs(aPath, aPlatformLibName.c_str(), length); + #else + const char* aPath = aPlatformLibName.c_str(); + #endif + // load plugin library LibHandle libHandle = LoadLib(aPath); #else - LibHandle libHandle = LoadLib(aPlatformLibName.c_str()); + LibHandle libHandle = LoadLib(aPlatformLibName.c_str()); #endif if (!libHandle) { // report any error, if occurred