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
Regression SALOME_TESTS/Grids/smesh/3D_mesh_NETGEN_02/C7
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.cxx
diff --git
a/src/SMESH/SMESH_Gen.cxx
b/src/SMESH/SMESH_Gen.cxx
index 127f7cc2bbcda550428d653a7adfe7aaf0e01f83..c8ba34bc33dc1d07aa213dab65459e05aeb88408 100644
(file)
--- a/
src/SMESH/SMESH_Gen.cxx
+++ b/
src/SMESH/SMESH_Gen.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-47,7
+47,7
@@
#include "memoire.h"
#include "memoire.h"
-#ifdef W
NT
+#ifdef W
IN32
#include <windows.h>
#endif
#include <windows.h>
#endif
@@
-392,8
+392,6
@@
bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
return ret;
}
return ret;
}
-
-#ifdef WITH_SMESH_CANCEL_COMPUTE
//=============================================================================
/*!
* Prepare Compute a mesh
//=============================================================================
/*!
* Prepare Compute a mesh
@@
-419,7
+417,6
@@
void SMESH_Gen::CancelCompute(SMESH_Mesh & aMesh,
_sm_current->ComputeStateEngine( SMESH_subMesh::COMPUTE_CANCELED );
}
}
_sm_current->ComputeStateEngine( SMESH_subMesh::COMPUTE_CANCELED );
}
}
-#endif
//=============================================================================
/*!
//=============================================================================
/*!
@@
-979,7
+976,7
@@
std::vector< std::string > SMESH_Gen::GetPluginXMLPaths()
sep = rootDir[pos];
break;
}
sep = rootDir[pos];
break;
}
-#ifdef W
NT
+#ifdef W
IN32
if (sep.empty() ) sep = "\\";
#else
if (sep.empty() ) sep = "/";
if (sep.empty() ) sep = "\\";
#else
if (sep.empty() ) sep = "/";
@@
-994,7
+991,7
@@
std::vector< std::string > SMESH_Gen::GetPluginXMLPaths()
xmlPath += tolower( pluginSubDir[pos] );
xmlPath += sep + plugin + ".xml";
bool fileOK;
xmlPath += tolower( pluginSubDir[pos] );
xmlPath += sep + plugin + ".xml";
bool fileOK;
-#ifdef W
NT
+#ifdef W
IN32
fileOK = (GetFileAttributes(xmlPath.c_str()) != INVALID_FILE_ATTRIBUTES);
#else
fileOK = (access(xmlPath.c_str(), F_OK) == 0);
fileOK = (GetFileAttributes(xmlPath.c_str()) != INVALID_FILE_ATTRIBUTES);
#else
fileOK = (access(xmlPath.c_str(), F_OK) == 0);