From e39265275468dd52a206a10e56f140a01e657263 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Fri, 22 Jan 2016 16:05:46 +0800 Subject: [PATCH] Fix compilation --- test/perftest/rapidjsontest.cpp | 8 ++++++++ test/unittest/readertest.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/perftest/rapidjsontest.cpp b/test/perftest/rapidjsontest.cpp index ad9bba3..4693755 100644 --- a/test/perftest/rapidjsontest.cpp +++ b/test/perftest/rapidjsontest.cpp @@ -24,6 +24,14 @@ #include "rapidjson/encodedstream.h" #include "rapidjson/memorystream.h" +#ifdef RAPIDJSON_SSE2 +#define SIMD_SUFFIX(name) name##_SSE2 +#elif defined(RAPIDJSON_SSE42) +#define SIMD_SUFFIX(name) name##_SSE42 +#else +#define SIMD_SUFFIX(name) name +#endif + using namespace rapidjson; class RapidJson : public PerfTest { diff --git a/test/unittest/readertest.cpp b/test/unittest/readertest.cpp index 6ef1351..c519983 100644 --- a/test/unittest/readertest.cpp +++ b/test/unittest/readertest.cpp @@ -417,7 +417,7 @@ TEST(Reader, ParseNumber_NormalPrecisionError) { a = h.actual_; uint64_t bias1 = e.ToBias(); uint64_t bias2 = a.ToBias(); - double ulp = bias1 >= bias2 ? bias1 - bias2 : bias2 - bias1; + double ulp = static_cast(bias1 >= bias2 ? bias1 - bias2 : bias2 - bias1); ulpMax = std::max(ulpMax, ulp); ulpSum += ulp; }