[cdo] 12/14: disable restrict patch

[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 653d96ed595e6d7fef56d3eeaed77a42c19d43a6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Dec 9 07:48:38 2017 +0000

    disable restrict patch
---
 debian/patches/remove-restrict.patch | 15 ---------------
 debian/patches/series                |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/patches/remove-restrict.patch b/debian/patches/remove-restrict.patch
index 35abb74..af3ccca 100644
--- a/debian/patches/remove-restrict.patch
+++ b/debian/patches/remove-restrict.patch
@@ -3,18 +3,3 @@ 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 c30b110..1d376df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ reproducible-builds.patch
 ppc64el.patch
 off_t-fix.patch
 fortran-fix.patch
-remove-restrict.patch
+#remove-restrict.patch

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