[oclgrind] 01/01: Fix isnan/isinf error for libc 2.23

[James Price]

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

jprice-guest pushed a commit to branch master
in repository oclgrind.

commit ffcd8fb5674a91ea93942c3e30810fff25b0cff4
Author: James Price <j.price at bristol.ac.uk>
Date:   Fri Mar 25 12:12:47 2016 +0000

    Fix isnan/isinf error for libc 2.23
---
 debian/changelog             |  6 ++++++
 debian/patches/series        |  1 +
 debian/patches/use-std.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a38688a..e3875ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+oclgrind (15.5-4) unstable; urgency=low
+
+  * Fix isnan/isinf usasge for libc 2.23 (Closes: #818823)
+
+ -- James Price <j.price at bristol.ac.uk>  Fri, 25 Mar 2016 12:09:43 +0000
+
 oclgrind (15.5-3) unstable; urgency=low
 
   * Use opencl-headers instead of local copy of CL/*.h
diff --git a/debian/patches/series b/debian/patches/series
index 570b7f6..1179602 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ cmake-preserve-flags.patch
 i386-shift-width.patch
 use-opencl-headers.patch
 altivec-fix.patch
+use-std.patch
diff --git a/debian/patches/use-std.patch b/debian/patches/use-std.patch
new file mode 100644
index 0000000..d2bb6c5
--- /dev/null
+++ b/debian/patches/use-std.patch
@@ -0,0 +1,46 @@
+Description: Take isnan/isinf from std:: instead of global namespace
+Author: James Price <j.price at bristol.ac.uk>
+Origin: upstream commit:038589b
+Last-Update: 2016-03-25
+--- a/src/core/WorkItem.cpp
++++ b/src/core/WorkItem.cpp
+@@ -793,7 +793,7 @@
+     }
+ 
+     // Deal with NaN operands
+-    if (::isnan(a) || ::isnan(b))
++    if (std::isnan(a) || std::isnan(b))
+     {
+       r = !llvm::CmpInst::isOrdered(pred);
+     }
+--- a/src/core/WorkItemBuiltins.cpp
++++ b/src/core/WorkItemBuiltins.cpp
+@@ -450,7 +450,7 @@
+ 
+     static double _sign_(double x)
+     {
+-      if (::isnan(x))  return  0.0;
++      if (std::isnan(x)) return 0.0;
+       if (x  >  0.0) return  1.0;
+       if (x == -0.0) return -0.0;
+       if (x ==  0.0) return  0.0;
+@@ -2359,7 +2359,7 @@
+       {
+         double x = FARGV(0, i);
+         double integral = trunc(x);
+-        double fractional = copysign(::isinf(x) ? 0.0 : x - integral, x);
++        double fractional = copysign(std::isinf(x) ? 0.0 : x - integral, x);
+ 
+         size_t offset = i*result.size;
+         result.setFloat(integral, i);
+@@ -2488,8 +2488,8 @@
+     static int64_t _isle_(double x, double y){ return islessequal(x, y); }
+     static int64_t _islg_(double x, double y){ return islessgreater(x, y); }
+     static int64_t _isfin_(double x){ return isfinite(x); }
+-    static int64_t _isinf_(double x){ return ::isinf(x); }
+-    static int64_t _isnan_(double x){ return ::isnan(x); }
++    static int64_t _isinf_(double x){ return std::isinf(x); }
++    static int64_t _isnan_(double x){ return std::isnan(x); }
+     static int64_t _isnorm_(double x){ return isnormal(x); }
+     static int64_t _isord_(double x, double y){ return !isunordered(x, y); }
+     static int64_t _isuord_(double x, double y){ return isunordered(x, y); }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git