From 824a310c6dc2d703bbe67526b45d79fbe9e0a68d Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Wed, 13 Nov 2024 09:54:09 +0000 Subject: [PATCH] Fix MSVC build. In commit 33be1b17, I updated rounding_mode.* to their current OpenCL-CTS versions without noticing that the old versions had an intentional deviation from OpenCL-CTS: a call to vlog_error had been commented out, and the headers that were needed only for that were also left out. This commit reapplies those changes. --- oclmath/rounding_mode.cpp | 2 -- oclmath/rounding_mode.h | 5 ----- 2 files changed, 7 deletions(-) diff --git a/oclmath/rounding_mode.cpp b/oclmath/rounding_mode.cpp index 24e8ea999..bc9faf92f 100644 --- a/oclmath/rounding_mode.cpp +++ b/oclmath/rounding_mode.cpp @@ -130,8 +130,6 @@ RoundingMode set_round(RoundingMode r, Type outType) { int err = _controlfp_s(&oldRound, 0, 0); // get rounding mode into oldRound if (err) { - vlog_error("\t\tERROR: -- cannot get rounding mode in %s:%d\n", __FILE__, - __LINE__); return kDefaultRoundingMode; // what else never happens } diff --git a/oclmath/rounding_mode.h b/oclmath/rounding_mode.h index 38c9e4c38..8ebd3430e 100644 --- a/oclmath/rounding_mode.h +++ b/oclmath/rounding_mode.h @@ -18,11 +18,6 @@ #include "compat.h" -#if (defined(_WIN32) && defined(_MSC_VER)) -#include "errorHelpers.h" -#include "testHarness.h" -#endif - typedef enum { kDefaultRoundingMode = 0, kRoundToNearestEven,