From: Nabil Ghodbane Date: Wed, 1 Dec 2021 14:04:49 +0000 (+0100) Subject: GMSHPlugin patch X-Git-Tag: V9_8_0~29 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=81f498e80d2eed08c639f36a73a81f5d9f241a45;p=tools%2Fsat_salome.git GMSHPlugin patch --- diff --git a/products/patches/GMSHPlugin_Mesher-ctx.patch b/products/patches/GMSHPlugin_Mesher-ctx.patch index 5112222..926c02f 100644 --- a/products/patches/GMSHPlugin_Mesher-ctx.patch +++ b/products/patches/GMSHPlugin_Mesher-ctx.patch @@ -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 +-#include ++#include + #endif + + #if GMSH_MAJOR_VERSION >=4 && GMSH_MINOR_VERSION >=8