[clblas] 70/125: Changes to compile for vs2013/vs12

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository clblas.

commit 900b2110d729c7f9b4b4f1b4bc402776dd8319bd
Author: Kent Knox <kent.knox at amd>
Date:   Mon May 19 14:13:41 2014 -0500

    Changes to compile for vs2013/vs12
---
 src/tests/include/BlasBase.h  | 1 +
 src/tests/include/blas-math.h | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/tests/include/BlasBase.h b/src/tests/include/BlasBase.h
index 1901afa..6c13e52 100644
--- a/src/tests/include/BlasBase.h
+++ b/src/tests/include/BlasBase.h
@@ -20,6 +20,7 @@
 
 #include <clBLAS.h>
 #include <common.h>
+#include <algorithm>
 
 #if _MSC_VER
 #pragma warning (disable:4127)
diff --git a/src/tests/include/blas-math.h b/src/tests/include/blas-math.h
index a7e3293..784c44b 100644
--- a/src/tests/include/blas-math.h
+++ b/src/tests/include/blas-math.h
@@ -20,10 +20,12 @@
 
 #if defined (_MSC_VER)
 
+#if( _MSC_VER <= 1700 )
 static unsigned long long ROW_NAN = 0x7ff0000000000000LL;
-static unsigned int ROW_NANF = 0x7fc00000;
-
 #define NAN *(reinterpret_cast<double*>(&ROW_NAN))
+#endif
+
+static unsigned int ROW_NANF = 0x7fc00000;
 #define NANF *(reinterpret_cast<float*>(&ROW_NANF))
 
 #else   /* _MSC_VER */

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