add changes for LibFlatArray which are required for MSVC, re #49

gentryx · Feb 20, 2017 · 342b8a4 · 342b8a4
1 parent 76ed6f1
commit 342b8a4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git a/lib/libflatarray/include/libflatarray/detail/preprocessor.hpp b/lib/libflatarray/include/libflatarray/detail/preprocessor.hpp
@@ -9,10 +9,11 @@
 #ifndef FLAT_ARRAY_DETAIL_PREPROCESSOR_HPP
 #define FLAT_ARRAY_DETAIL_PREPROCESSOR_HPP
 
+#define LIBFLATARRAY_NIL()
 #define LIBFLATARRAY_ELEM_I(INDEX, LIST) LIBFLATARRAY_ELEM_II(LIBFLATARRAY_ELEM_ ## INDEX LIST)
 #define LIBFLATARRAY_ELEM_II(ELEMENT) LIBFLATARRAY_ELEM_III(ELEMENT)
 #define LIBFLATARRAY_ELEM_III(ELEMENT, _) ELEMENT
-#define LIBFLATARRAY_ELEM_0(ELEMENT) ELEMENT, LIBFLATARRAY_PP_NIL
+#define LIBFLATARRAY_ELEM_0(ELEMENT) ELEMENT, LIBFLATARRAY_NIL()
 #define LIBFLATARRAY_ELEM_1(_)  LIBFLATARRAY_ELEM_0
 #define LIBFLATARRAY_ELEM_2(_)  LIBFLATARRAY_ELEM_1
 #define LIBFLATARRAY_ELEM_3(_)  LIBFLATARRAY_ELEM_2

diff --git a/lib/libflatarray/include/libflatarray/short_vec.hpp b/lib/libflatarray/include/libflatarray/short_vec.hpp
@@ -45,17 +45,17 @@ inline bool any(const short_vec<CARGO, ARITY>& vec)
     return vec.any();
 }
 
-inline bool any(unsigned mask)
+inline unsigned any(unsigned mask)
 {
     return mask;
 }
 
-inline bool any(unsigned short mask)
+inline unsigned short any(unsigned short mask)
 {
     return mask;
 }
 
-inline bool any(unsigned char mask)
+inline unsigned char any(unsigned char mask)
 {
     return mask;
 }

diff --git a/lib/libflatarray/include/libflatarray/testbed/benchmark.hpp b/lib/libflatarray/include/libflatarray/testbed/benchmark.hpp
@@ -8,7 +8,11 @@
 #ifndef FLAT_ARRAY_TESTBED_BENCHMARK_HPP
 #define FLAT_ARRAY_TESTBED_BENCHMARK_HPP
 
+#ifdef _WIN32
+#include <Windows.h>
+#else
 #include <sys/time.h>
+#endif
 
 namespace LibFlatArray {
 
@@ -27,10 +31,18 @@ class benchmark
 
     static double time()
     {
+#ifdef _WIN32
+		LARGE_INTEGER time;
+		LARGE_INTEGER freq;
+		QueryPerformanceCounter(&time);
+		QueryPerformanceFrequency(&freq);
+		return 1.0 * time.QuadPart / freq.QuadPart;
+#else
         timeval t;
         gettimeofday(&t, 0);
+		return t.tv_sec + t.tv_usec * 1.0e-6;
+#endif
 
-        return t.tv_sec + t.tv_usec * 1.0e-6;
     }
 
 };

diff --git a/lib/libflatarray/include/libflatarray/testbed/evaluate.hpp b/lib/libflatarray/include/libflatarray/testbed/evaluate.hpp
@@ -11,7 +11,10 @@
 #include <libflatarray/testbed/benchmark.hpp>
 #include <ctime>
 #include <iomanip>
+#ifdef _WIN32
+#else
 #include <unistd.h>
+#endif
 
 namespace LibFlatArray {
 

diff --git a/lib/libflatarray/test/test.hpp b/lib/libflatarray/test/test.hpp
@@ -6,9 +6,15 @@
 #include <sstream>
 
 #ifndef BOOST_TEST
+// Microsoft Visual Studio doesn't define __PRETTY_FUNCTION__:
+#ifdef _MSC_VER
+#define BOOST_TEST(ARG) if (!(ARG)) { std::cerr << __FILE__ << "(" << __LINE__ << "): test '" << #ARG << "' failed in function '" << __FUNCSIG__ << "'" << std::endl; }
+#else
 #define BOOST_TEST(ARG) if (!(ARG)) { std::cerr << __FILE__ << "(" << __LINE__ << "): test '" << #ARG << "' failed in function '" << __PRETTY_FUNCTION__ << "'" << std::endl; }
 #endif
 
+#endif
+
 
 #ifndef BOOST_TEST_EQ
 #define BOOST_TEST_EQ(A, B) BOOST_TEST((A) == (B))