summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-22 11:11:26 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-22 11:11:26 +0100
commit5a5926a3852c1ca8283293c690f0b568f65c1422 (patch)
tree3bd4da2d0121cd54270311a2f84dab09d48606ba /external
parentc620b70a19c05f2805ede41005dd9215593a912e (diff)
-Werror,-Winfinite-recursion
Change-Id: I5485e879b30a1559127ee5f0060aa7d740fb2e7d
Diffstat (limited to 'external')
-rw-r--r--external/vigra/vigra1.6.0.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/vigra/vigra1.6.0.patch b/external/vigra/vigra1.6.0.patch
index 18eeb5680826..7b0910866ebd 100644
--- a/external/vigra/vigra1.6.0.patch
+++ b/external/vigra/vigra1.6.0.patch
@@ -775,7 +775,7 @@ diff -uprN misc/vigra1.6.0/include/vigra/gaussians.hxx misc/build/vigra1.6.0/inc
-VIGRA_DEFINE_MISSING_ABS(signed char)
-VIGRA_DEFINE_MISSING_ABS(signed short)
+#define VIGRA_DEFINE_SIGNED_ABS(T) \
-+ inline T abs(T t) { return (T)abs(t); }
++ inline T abs(T t) { return (T)std::abs(t); }
+#define VIGRA_DEFINE_SIGNED_LABS(T) \
+ inline T abs(T t) { return (T)labs(t); }
+#define VIGRA_DEFINE_SIGNED_LLABS(T) \