]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
bos #24228 : temporary fix until integrated
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Mon, 3 May 2021 10:50:49 +0000 (12:50 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Mon, 3 May 2021 10:50:49 +0000 (12:50 +0200)
products/SMESH.pyconf
products/patches/BOS-24228.patch [new file with mode: 0644]

index d526be37e08e114d44b2c4332e39b798700b3830..3d9963a1098a4be78ce7f84e80d46a623c96b303 100644 (file)
@@ -86,6 +86,7 @@ default_win :
               "tbb"
             ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit", "f2c"]
+    patches : ['BOS-24228.patch']
 }
 
 default_MPI :
diff --git a/products/patches/BOS-24228.patch b/products/patches/BOS-24228.patch
new file mode 100644 (file)
index 0000000..6829e2e
--- /dev/null
@@ -0,0 +1,22 @@
+diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
+index a68966e63..3ba0ffdc6 100644
+--- a/src/SMESHGUI/SMESHGUI.cxx
++++ b/src/SMESHGUI/SMESHGUI.cxx
+@@ -187,7 +187,7 @@
+ // Below macro, when uncommented, switches on simplified (more performant) algorithm
+ // of auto-color picking up
+ #define SIMPLE_AUTOCOLOR
+-
++#include <smIdType.hxx>
+ namespace
+ {
+   // Declarations
+@@ -1226,7 +1226,7 @@ namespace
+             SMESH::Controls::NumericalFunctor* aNumFun =
+               dynamic_cast<SMESH::Controls::NumericalFunctor*>( aFunctor.get() );
+             if ( aNumFun ) {
+-              std::vector<SMESH::smIdType> elements;
++              std::vector<smIdType> elements;
+               SMESH::SMESH_Mesh_var mesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIO);
+               if ( mesh->_is_nil() ) {
+                 SMESH::SMESH_IDSource_var idSource =