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
Unify function headers
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.cxx
diff --git
a/src/SMESH/SMESH_Gen.cxx
b/src/SMESH/SMESH_Gen.cxx
index 574d4b3dedba14709fe847a3806a3c72378678d1..f00d3a4d5f4f506d93d01b9ec8de9feec342d7a8 100644
(file)
--- a/
src/SMESH/SMESH_Gen.cxx
+++ b/
src/SMESH/SMESH_Gen.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
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
@@
-56,6
+56,13
@@
using namespace std;
using namespace std;
+// Environment variable separator
+#ifdef WIN32
+ #define env_sep ';'
+#else
+ #define env_sep ':'
+#endif
+
//=============================================================================
/*!
* Constructor
//=============================================================================
/*!
* Constructor
@@
-93,12
+100,12
@@
namespace
SMESH_Gen::~SMESH_Gen()
{
SMESH_Gen::~SMESH_Gen()
{
-
std::map < int, SMESH_Hypothesis * >::iterator i_hyp = _studyContext->mapHypothesis.begin();
-
for ( ; i_hyp != _studyContext->mapHypothesis.end(); ++i_hyp )
-
{
-
if ( _Hyp* h = static_cast< _Hyp*>( i_hyp->second ))
-
h->NullifyGen();
-
}
+ std::map < int, SMESH_Hypothesis * >::iterator i_hyp = _studyContext->mapHypothesis.begin();
+ for ( ; i_hyp != _studyContext->mapHypothesis.end(); ++i_hyp )
+ {
+ if ( _Hyp* h = static_cast< _Hyp*>( i_hyp->second ))
+ h->NullifyGen();
+ }
delete _studyContext->myDocument;
delete _studyContext;
}
delete _studyContext->myDocument;
delete _studyContext;
}
@@
-984,7
+991,7
@@
std::vector< std::string > SMESH_Gen::GetPluginXMLPaths()
while ( from < meshers.size() )
{
// cut off plugin name
while ( from < meshers.size() )
{
// cut off plugin name
- pos = meshers.find(
':'
, from );
+ pos = meshers.find(
env_sep
, from );
if ( pos != string::npos )
plugin = meshers.substr( from, pos-from );
else
if ( pos != string::npos )
plugin = meshers.substr( from, pos-from );
else
@@
-1032,13
+1039,13
@@
std::vector< std::string > SMESH_Gen::GetPluginXMLPaths()
bool fileOK;
#ifdef WIN32
#ifdef UNICODE
bool fileOK;
#ifdef WIN32
#ifdef UNICODE
-
const wchar_t* path = Kernel_Utils::decode_s(xmlPath);
+ const wchar_t* path = Kernel_Utils::decode_s(xmlPath);
#else
#else
-
const char* path = xmlPath.c_str();
+ const char* path = xmlPath.c_str();
#endif
fileOK = (GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES);
#ifdef UNICODE
#endif
fileOK = (GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES);
#ifdef UNICODE
-
delete path;
+ delete path;
#endif
#else
fileOK = (access(xmlPath.c_str(), F_OK) == 0);
#endif
#else
fileOK = (access(xmlPath.c_str(), F_OK) == 0);