Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into gni/documentation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_HypothesesUtils.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index d752566db38822e9826dd8f432b324323de4b1e9..9c67829795d66199da13d8278d4c0025785724ad 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-67,6
+67,7
@@
#define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress
#define UnLoadLib( handle ) FreeLibrary( handle );
#define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress
#define UnLoadLib( handle ) FreeLibrary( handle );
+ #define env_sep ";"
#else // WIN32
#define LibHandle void*
#ifdef DYNLOAD_LOCAL
#else // WIN32
#define LibHandle void*
#ifdef DYNLOAD_LOCAL
@@
-76,6
+77,7
@@
#endif // DYNLOAD_LOCAL
#define GetProc dlsym
#define UnLoadLib( handle ) dlclose( handle );
#endif // DYNLOAD_LOCAL
#define GetProc dlsym
#define UnLoadLib( handle ) dlclose( handle );
+ #define env_sep ":"
#endif // WIN32
#ifdef _DEBUG_
#endif // WIN32
#ifdef _DEBUG_
@@
-197,7
+199,7
@@
namespace SMESH
if (cenv)
HypsXml.sprintf("%s", cenv);
if (cenv)
HypsXml.sprintf("%s", cenv);
- QStringList HypsXmlList = HypsXml.split(
":"
, QString::SkipEmptyParts);
+ QStringList HypsXmlList = HypsXml.split(
env_sep
, QString::SkipEmptyParts);
if (HypsXmlList.count() == 0) {
SUIT_MessageBox::critical(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"),
if (HypsXmlList.count() == 0) {
SUIT_MessageBox::critical(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"),