[cdo] 07/14: Patch for restrict on float issue

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cdo.

commit fab0eff1616fd743b95b6f7e3818668c9577e8ac
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 21 10:07:29 2017 +0000

    Patch for restrict on float issue
---
 debian/changelog                     |  3 ++-
 debian/patches/remove-restrict.patch | 20 ++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c2b5b6a..1e4ac23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-cdo (1.9.2+dfsg.1~rc2-1) unstable; urgency=medium
+cdo (1.9.2+dfsg.1~rc2-1) experimental; urgency=medium
 
   * Testing 1.9.2rc1 release
   * Need fortran-fix.patch for missing decl in mo_cdi.F90
+  * Patch for restrict on float issue
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 20 Nov 2017 17:07:39 +0000
 
diff --git a/debian/patches/remove-restrict.patch b/debian/patches/remove-restrict.patch
new file mode 100644
index 0000000..35abb74
--- /dev/null
+++ b/debian/patches/remove-restrict.patch
@@ -0,0 +1,20 @@
+Description: g++ will not allow restrict with float.
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2017-11-20
+Forwarded: no
+
+Index: cdo-1.9.2+dfsg.1~rc2/src/grid_search.cc
+===================================================================
+--- cdo-1.9.2+dfsg.1~rc2.orig/src/grid_search.cc
++++ cdo-1.9.2+dfsg.1~rc2/src/grid_search.cc
+@@ -178,7 +178,9 @@ nfTree_t *gs_create_nanoflann(size_t n,
+   min[0] = min[1] = min[2] =  1e9;
+   max[0] = max[1] = max[2] = -1e9;
+   // Generating  Point Cloud
+-  float restrict point[3];
++  // grid_search.cc:181:25: error: ‘__restrict__’ qualifiers cannot be applied to ‘float’
++  //float restrict point[3];
++  float  point[3];
+   pointcloud->pts.resize(n);
+ #if defined(HAVE_OPENMP4)
+ #pragma omp simd
diff --git a/debian/patches/series b/debian/patches/series
index c722914..c30b110 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ reproducible-builds.patch
 ppc64el.patch
 off_t-fix.patch
 fortran-fix.patch
+remove-restrict.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git