ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Finalize windows porting

Browse Source
This commit is contained in:
rnv 2018-09-07 11:40:44 +03:00
parent 43ee452778
commit 053c21a38a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -2510,7 +2510,8 @@ void GEOM_Gen_i::LoadPlugin(const std::string& theLibName)
// check, if corresponding operations are already created // check, if corresponding operations are already created
if (myOpCreatorMap.find(theLibName) == myOpCreatorMap.end()) { if (myOpCreatorMap.find(theLibName) == myOpCreatorMap.end()) {
#ifdef UNICODE #if WIN32
#if UNICODE
//RNV: this is workaround for providing compilation, //RNV: this is workaround for providing compilation,
// path should be processed as unicode string. // path should be processed as unicode string.
size_t length = strlen(aPlatformLibName.c_str()) + sizeof(char); size_t length = strlen(aPlatformLibName.c_str()) + sizeof(char);
@ -2518,10 +2519,9 @@ void GEOM_Gen_i::LoadPlugin(const std::string& theLibName)
memset(aPath, '\0', length); memset(aPath, '\0', length);
mbstowcs(aPath, aPlatformLibName.c_str(), length); mbstowcs(aPath, aPlatformLibName.c_str(), length);
#else #else
const char* aPath = xmlPath.c_str(); const char* aPath = aPlatformLibName.c_str();
#endif #endif
// load plugin library // load plugin library
#if WIN32
LibHandle libHandle = LoadLib(aPath); LibHandle libHandle = LoadLib(aPath);
#else #else
LibHandle libHandle = LoadLib(aPlatformLibName.c_str()); LibHandle libHandle = LoadLib(aPlatformLibName.c_str());