[Libreoffice-commits] core.git: external/vigra

[Stephan Bergmann]

 external/vigra/vigra1.6.0.patch |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a5926a3852c1ca8283293c690f0b568f65c1422
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 22 11:11:26 2014 +0100

    -Werror,-Winfinite-recursion
    
    Change-Id: I5485e879b30a1559127ee5f0060aa7d740fb2e7d

diff --git a/external/vigra/vigra1.6.0.patch b/external/vigra/vigra1.6.0.patch
index 18eeb56..7b09108 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) \