]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
GMSHPlugin patch
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Wed, 1 Dec 2021 14:04:49 +0000 (15:04 +0100)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Wed, 1 Dec 2021 14:04:49 +0000 (15:04 +0100)
products/patches/GMSHPlugin_Mesher-ctx.patch

index 51122224505b4dba23a50dc5f69bfdb1e5037d3b..926c02f68294ab2d5ccc48cf41f27d96bf257f42 100644 (file)
@@ -1,14 +1,13 @@
 diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
-index 8ac85b5..a9a691a 100644
+index 8ac85b5..847526e 100644
 --- a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
 +++ b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
-@@ -1028,7 +1028,9 @@ void  GMSHPlugin_Mesher::mymsg::operator()(std::string level, std::string msg)
-     }
-     if (level == "Fatal")
-     {
-+#ifndef WIN32
-         CTX::instance()->lock = 0;
-+#endif
-         throw oss.str();
-     }
-     else
+@@ -60,7 +60,7 @@
+ #if GMSH_MAJOR_VERSION >=4
+ #include <GmshGlobal.h>
+-#include <Context.h>
++#include <gmsh/Context.h>
+ #endif
+ #if GMSH_MAJOR_VERSION >=4 && GMSH_MINOR_VERSION >=8