]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
bos #24228 - remove patch since integrated
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Mon, 3 May 2021 17:38:56 +0000 (19:38 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Mon, 3 May 2021 17:38:56 +0000 (19:38 +0200)
products/SMESH.pyconf
products/patches/BOS-24228.patch [deleted file]

index 3d9963a1098a4be78ce7f84e80d46a623c96b303..d526be37e08e114d44b2c4332e39b798700b3830 100644 (file)
@@ -86,7 +86,6 @@ 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
deleted file mode 100644 (file)
index 6829e2e..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-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 =