[sosi2osm] 02/02: Add patch to use std::max from algorithm. (closes: #835717)

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository sosi2osm.

commit 919df86bbbca542b1633d96f8be6e8b13a71ade7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 28 19:28:14 2016 +0200

    Add patch to use std::max from algorithm. (closes: #835717)
---
 debian/changelog             |  2 ++
 debian/patches/series        |  1 +
 debian/patches/std-max.patch | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f78bb17..d16f4c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ sosi2osm (1.0.0-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Update Vcs-Git URL to use HTTPS.
+  * Add patch to use std::max from algorithm.
+    (closes: #835717)
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 28 Aug 2016 18:23:18 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 3806975..b53c55d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix_libsearchpath.patch
 02_fix_install.patch
+std-max.patch
diff --git a/debian/patches/std-max.patch b/debian/patches/std-max.patch
new file mode 100644
index 0000000..f933503
--- /dev/null
+++ b/debian/patches/std-max.patch
@@ -0,0 +1,22 @@
+Description: Use std::max from algorithm.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/835717
+
+--- a/node.cpp
++++ b/node.cpp
+@@ -1,5 +1,6 @@
+ #include "sosi2osm.h"
+ 
++#include <algorithm>
+ #include <proj_api.h>
+ 
+ projPJ origProj, osmProj;
+@@ -51,7 +52,7 @@ long createNode(double lat, double lon,
+     }
+     
+     if (lenM >= sizeM) {
+-    	sizeM = max(1024, sizeM*2);
++    	sizeM = std::max(1024, sizeM*2);
+     	latM = (double*)realloc(latM, sizeof(double) * sizeM);
+     	lonM = (double*)realloc(lonM, sizeof(double) * sizeM);
+     	kpM = (short*)realloc(kpM, sizeof(short) * sizeM);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sosi2osm.git