Package: sosi2osm / 1.0.0-3

std-max.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
Description: Use std::max from algorithm.
Author: Bas Couwenberg <sebastic@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);