From 867cc5f0fcc4d52729901b759058974798ff5793 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Wed, 18 Jul 2018 18:57:07 +0100 Subject: [PATCH] Stop using BOOST_WORKAROUND in a header which may be included in C code. --- include/boost/regex/v4/match_flags.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/boost/regex/v4/match_flags.hpp b/include/boost/regex/v4/match_flags.hpp index 1938b27a..aa8fd532 100644 --- a/include/boost/regex/v4/match_flags.hpp +++ b/include/boost/regex/v4/match_flags.hpp @@ -22,7 +22,6 @@ #ifdef __cplusplus # include #endif -#include #ifdef __cplusplus namespace boost{ @@ -83,7 +82,7 @@ typedef enum _match_flags } match_flags; -#if defined(__BORLANDC__) || BOOST_WORKAROUND(BOOST_MSVC, <= 1310) +#if defined(__BORLANDC__) || (defined(_MSC_VER) && (_MSC_VER <= 1310)) typedef unsigned long match_flag_type; #else typedef match_flags match_flag_type;