From c71fe6c9128e0051385a78002d18d485d676b559 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Tue, 1 Jan 2019 19:36:31 +0100 Subject: [PATCH] Undef small and near if defined Not only happens on MSVC but also on MinGW (and probably all windows builds) --- include/turtle/constraints.hpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/turtle/constraints.hpp b/include/turtle/constraints.hpp index 52931b8..a24ee04 100644 --- a/include/turtle/constraints.hpp +++ b/include/turtle/constraints.hpp @@ -77,13 +77,14 @@ namespace detail #endif // BOOST_VERSION < 105900 -#ifdef BOOST_MSVC +#ifdef small # pragma push_macro( "small" ) # undef small +# define MOCK_SMALL_DEFINED #endif MOCK_NARY_CONSTRAINT( small, 1, ( tolerance ), ( MOCK_SMALL() ) ) -#ifdef BOOST_MSVC +#ifdef MOCK_SMALL_DEFINED # pragma pop_macro( "small" ) #endif @@ -96,13 +97,14 @@ namespace detail #undef MOCK_PERCENT_TOLERANCE #undef MOCK_FRACTION_TOLERANCE -#ifdef BOOST_MSVC +#ifdef near # pragma push_macro( "near" ) # undef near +# define MOCK_NEAR_DEFINED #endif MOCK_NARY_CONSTRAINT( near, 2, ( expected, tolerance ), std::abs( actual - expected ) < tolerance ) -#ifdef BOOST_MSVC +#ifdef MOCK_NEAR_DEFINED # pragma pop_macro( "near" ) #endif