From fee0308da39e1e2f4d9d0d92c6146a0a64ad2ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20M=C3=BCssig?= Date: Fri, 31 Jan 2025 21:47:11 +0100 Subject: [PATCH] fixes unit tests not compiling under windows --- src/common/Utilities/Random.h | 3 ++- src/test/common/Configuration/Config.cpp | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/common/Utilities/Random.h b/src/common/Utilities/Random.h index 07bc91d3aec555..60d543bc4d7266 100644 --- a/src/common/Utilities/Random.h +++ b/src/common/Utilities/Random.h @@ -17,7 +17,8 @@ #ifndef Random_h__ #define Random_h__ - +#undef max +#undef min #include "Define.h" #include "Duration.h" #include diff --git a/src/test/common/Configuration/Config.cpp b/src/test/common/Configuration/Config.cpp index df1889a88a9460..769ca82f501c57 100644 --- a/src/test/common/Configuration/Config.cpp +++ b/src/test/common/Configuration/Config.cpp @@ -24,6 +24,13 @@ #include #include +#if WIN32 + void inline setenv(const char* name, const char* value, int overwrite) + { + _putenv_s(name, value); + } +#endif + std::string CreateConfigWithMap(std::map const& map) { auto mTempFileRel = boost::filesystem::unique_path("deleteme.ini"); @@ -36,8 +43,12 @@ std::string CreateConfigWithMap(std::map const& map) iniStream << itr.first << " = " << itr.second << "\n"; iniStream.close(); - +#if WIN32 + auto tmp = mTempFileAbs.native(); + return std::string(tmp.begin(), tmp.end());; +#else return mTempFileAbs.native(); +#endif } class ConfigEnvTest : public testing::Test {