summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBoris Pek <tehnick-8@yandex.ru>2016-05-04 13:39:20 (GMT)
committerBoris Pek <tehnick-8@yandex.ru>2016-05-04 13:39:20 (GMT)
commit73cd8137d1816b94abb1b11e2b5e31c3e86ebe6e (patch)
tree1890520172a621ad87c6dd17acc0ad201c3ff7a6 /src
parent7e3e75cc7a7a7e694dfb5693bac462f9b1d968d4 (diff)
downloadmxe-73cd8137d1816b94abb1b11e2b5e31c3e86ebe6e.zip
mxe-73cd8137d1816b94abb1b11e2b5e31c3e86ebe6e.tar.gz
mxe-73cd8137d1816b94abb1b11e2b5e31c3e86ebe6e.tar.bz2
flann: add new patch: fix build with GCC >= 6.x
Diffstat (limited to 'src')
-rw-r--r--src/flann-4-c++11-related-fixes.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/src/flann-4-c++11-related-fixes.patch b/src/flann-4-c++11-related-fixes.patch
new file mode 100644
index 0000000..90be357
--- /dev/null
+++ b/src/flann-4-c++11-related-fixes.patch
@@ -0,0 +1,31 @@
+This file is part of MXE.
+See index.html for further information.
+
+Taken from: https://github.com/mariusmuja/flann/commit/3645f0c30a47267e56e5acdecfc7bac2b76bc3d5
+
+From 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5 Mon Sep 17 00:00:00 2001
+From: Alastair Quadros <alastair.j.quadros@gmail.com>
+Date: Sun, 15 Mar 2015 10:58:57 +1100
+Subject: [PATCH] abs -> std::abs
+
+diff --git a/src/cpp/flann/algorithms/kdtree_index.h b/src/cpp/flann/algorithms/kdtree_index.h
+index 42659ca..fc12d8f 100644
+--- a/src/cpp/flann/algorithms/kdtree_index.h
++++ b/src/cpp/flann/algorithms/kdtree_index.h
+@@ -36,6 +36,7 @@
+ #include <cassert>
+ #include <cstring>
+ #include <stdarg.h>
++#include <cmath>
+
+ #include "flann/general.h"
+ #include "flann/algorithms/nn_index.h"
+@@ -663,7 +664,7 @@
+ ElementType max_span = 0;
+ size_t div_feat = 0;
+ for (size_t i=0;i<veclen_;++i) {
+- ElementType span = abs(point[i]-leaf_point[i]);
++ ElementType span = std::abs(point[i]-leaf_point[i]);
+ if (span > max_span) {
+ max_span = span;
+ div_feat = i;