[numexpr] 01/01: Improve 0001-fix-test-on-powerpc-and-ppc64el.patch

[Antonio Valentino]

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

a_valentino-guest pushed a commit to branch master
in repository numexpr.

commit db43200f9efc6930605b5f4e0960ea046af5998a
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Wed Nov 30 07:38:51 2016 +0100

    Improve 0001-fix-test-on-powerpc-and-ppc64el.patch
    
    he new version has been already merged upstream
---
 debian/changelog                                          |  2 +-
 debian/patches/0001-fix-test-on-powerpc-and-ppc64el.patch | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ddde909..168ac95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ numexpr (2.6.1-2) unstable; urgency=high
     - new patch to fix test failures on ppc64el and powerpc
       See also upstream bug #224 (https://github.com/pydata/numexpr/issues/224)
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 26 Nov 2016 16:12:30 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Wed, 30 Nov 2016 06:49:02 +0000
 
 numexpr (2.6.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/0001-fix-test-on-powerpc-and-ppc64el.patch b/debian/patches/0001-fix-test-on-powerpc-and-ppc64el.patch
index 6c830b0..467e739 100644
--- a/debian/patches/0001-fix-test-on-powerpc-and-ppc64el.patch
+++ b/debian/patches/0001-fix-test-on-powerpc-and-ppc64el.patch
@@ -6,19 +6,22 @@ See also upstream bug #224 [1]
 
 [1] https://github.com/pydata/numexpr/issues/224
 ---
- numexpr/interp_body.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ numexpr/interp_body.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/numexpr/interp_body.cpp b/numexpr/interp_body.cpp
-index 475a89f..a8c2911 100644
+index 475a89f..cd5bb45 100644
 --- a/numexpr/interp_body.cpp
 +++ b/numexpr/interp_body.cpp
-@@ -271,7 +271,7 @@
+@@ -271,7 +271,11 @@
          case OP_SUB_LLL: VEC_ARG2(l_dest = l1 - l2);
          case OP_MUL_LLL: VEC_ARG2(l_dest = l1 * l2);
          case OP_DIV_LLL: VEC_ARG2(l_dest = l2 ? (l1 / l2) : 0);
--        case OP_POW_LLL: VEC_ARG2(l_dest = (l2 < 0) ? (1 / l1) : (long long)pow((long double)l1, (long double)l2));
-+        case OP_POW_LLL: VEC_ARG2(l_dest = (l2 < 0) ? (1 / l1) : (long long)round(pow((long double)l1, (long double)l2)));
++#if defined _MSC_VER && _MSC_VER < 1800
+         case OP_POW_LLL: VEC_ARG2(l_dest = (l2 < 0) ? (1 / l1) : (long long)pow((long double)l1, (long double)l2));
++#else
++        case OP_POW_LLL: VEC_ARG2(l_dest = (l2 < 0) ? (1 / l1) : (long long)llround(pow((long double)l1, (long double)l2)));
++#endif
          case OP_MOD_LLL: VEC_ARG2(l_dest = l2 ? (l1 % l2) : 0);
          case OP_LSHIFT_LLL: VEC_ARG2(l_dest = l1 << l2);
          case OP_RSHIFT_LLL: VEC_ARG2(l_dest = l1 >> l2);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/numexpr.git