From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Thu, 15 Jun 2017 16:39:31 +0000 (+0200)
Subject: Add patch for eigen 3.2.7
X-Git-Tag: V9_0_0~14^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3009654c0682c76497e54510ccaef610ef41808a;p=tools%2Fconfiguration.git

Add patch for eigen 3.2.7
---

diff --git a/config/patches/eigen.001_replace_nullptr.patch b/config/patches/eigen.001_replace_nullptr.patch
new file mode 100644
index 0000000..77d31cf
--- /dev/null
+++ b/config/patches/eigen.001_replace_nullptr.patch
@@ -0,0 +1,37 @@
+commit 43401eee36e1af2ca170b2824e76875f2ac56964
+Author: spo <sergey.pokhodenko@opencascade.com>
+Date:   Tue Dec 22 12:46:02 2015 +0300
+
+    Replace nullptr with 0
+
+diff --git a/Eigen/src/Core/DenseStorage.h b/Eigen/src/Core/DenseStorage.h
+index 568493c..c30c084 100755
+--- a/Eigen/src/Core/DenseStorage.h
++++ b/Eigen/src/Core/DenseStorage.h
+@@ -278,7 +278,7 @@ template<typename T, int _Options> class DenseStorage<T, Dynamic, Dynamic, Dynam
+       , m_rows(std::move(other.m_rows))
+       , m_cols(std::move(other.m_cols))
+     {
+-      other.m_data = nullptr;
++      other.m_data = 0;
+     }
+     DenseStorage& operator=(DenseStorage&& other)
+     {
+@@ -336,7 +336,7 @@ template<typename T, int _Rows, int _Options> class DenseStorage<T, Dynamic, _Ro
+       : m_data(std::move(other.m_data))
+       , m_cols(std::move(other.m_cols))
+     {
+-      other.m_data = nullptr;
++      other.m_data = 0;
+     }
+     DenseStorage& operator=(DenseStorage&& other)
+     {
+@@ -390,7 +390,7 @@ template<typename T, int _Cols, int _Options> class DenseStorage<T, Dynamic, Dyn
+       : m_data(std::move(other.m_data))
+       , m_rows(std::move(other.m_rows))
+     {
+-      other.m_data = nullptr;
++      other.m_data = 0;
+     }
+     DenseStorage& operator=(DenseStorage&& other)
+     {
diff --git a/config/salome.xml b/config/salome.xml
index 568bace..289255a 100644
--- a/config/salome.xml
+++ b/config/salome.xml
@@ -134,6 +134,9 @@
   <product name="tclx" version="8.4.1" />
   <product name="tbb" version="4.2.4" />
   <product name="eigen" version="3.2.7" />
+    <patches>
+      <patch comment="Replace nullptr with 0" name="eigen.001_replace_nullptr.patch" />
+    </patches>
   <product name="planegcs" version="0.16" />
   <product comment="SALOME Geometry module" name="geom" version="V8_3_0" />
   <product comment="SALOME GUI module" name="gui" version="V8_3_0" />