From 98f74701a77b0493c81bed35861779052734eb86 Mon Sep 17 00:00:00 2001 From: oak nauhygon Date: Sun, 7 May 2017 23:11:38 -0400 Subject: [PATCH] #451: Fix min/max macro conflicts on Windows --- sbe-tool/src/main/cpp/sbe/sbe.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sbe-tool/src/main/cpp/sbe/sbe.h b/sbe-tool/src/main/cpp/sbe/sbe.h index 5f30fa4a4e..ef110646ce 100644 --- a/sbe-tool/src/main/cpp/sbe/sbe.h +++ b/sbe-tool/src/main/cpp/sbe/sbe.h @@ -79,14 +79,14 @@ namespace sbe { #define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c)) #endif -#define SBE_NULLVALUE_INT8 std::numeric_limits::min() -#define SBE_NULLVALUE_INT16 std::numeric_limits::min() -#define SBE_NULLVALUE_INT32 std::numeric_limits::min() -#define SBE_NULLVALUE_INT64 std::numeric_limits::min() -#define SBE_NULLVALUE_UINT8 std::numeric_limits::max() -#define SBE_NULLVALUE_UINT16 std::numeric_limits::max() -#define SBE_NULLVALUE_UINT32 std::numeric_limits::max() -#define SBE_NULLVALUE_UINT64 std::numeric_limits::max() +#define SBE_NULLVALUE_INT8 (std::numeric_limits::min)() +#define SBE_NULLVALUE_INT16 (std::numeric_limits::min)() +#define SBE_NULLVALUE_INT32 (std::numeric_limits::min)() +#define SBE_NULLVALUE_INT64 (std::numeric_limits::min)() +#define SBE_NULLVALUE_UINT8 (std::numeric_limits::max)() +#define SBE_NULLVALUE_UINT16 (std::numeric_limits::max)() +#define SBE_NULLVALUE_UINT32 (std::numeric_limits::max)() +#define SBE_NULLVALUE_UINT64 (std::numeric_limits::max)() namespace MetaAttribute {