sc/source/core/opencl/formulagroupcl.cxx | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
New commits:
commit d1ffaf5315497140dedbc67c78f14706591b314e
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Sun Jul 31 13:36:06 2016 +0200
sc: replace NAN macro with rtl::math::setNan
Change-Id: I38f52faf974a3481adbf20a3b2484324d322f5bc
Reviewed-on: https://gerrit.libreoffice.org/27747
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 29dc9f8..ef46c48 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -82,17 +82,6 @@ static const char* publicFunc =
"double strequal(unsigned a, unsigned b) { return (a==b)?1.0:0; }\n"
;
-#ifdef _WIN32
-#ifndef NAN
-namespace {
-
-const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
-
-}
-#define NAN (*(const double*) __nan)
-#endif
-#endif
-
#include <list>
#include <map>
#include <iostream>
@@ -238,7 +227,7 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int,
cl_program )
throw OpenCLError("clEnqueueMapBuffer", err, __FILE__, __LINE__);
for (size_t i = 0; i < szHostBuffer / sizeof(double); i++)
- pNanBuffer[i] = NAN;
+ rtl::math::setNan(&pNanBuffer[i]);
err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, mpClmem,
pNanBuffer, 0, nullptr, nullptr);
// FIXME: Is it intentional to not throw an OpenCLError even if the
clEnqueueUnmapMemObject() fails?
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
