From e474eea44f00ba92310ace20add3956adb83f3de Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Sun, 26 Mar 2017 01:02:05 -0700 Subject: [PATCH] Slight correction to particularize previous change as involving only -fno-ms-compatibility mode. --- include/boost/preprocessor/config/config.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/preprocessor/config/config.hpp b/include/boost/preprocessor/config/config.hpp index f36fcde..4054cfa 100644 --- a/include/boost/preprocessor/config/config.hpp +++ b/include/boost/preprocessor/config/config.hpp @@ -33,7 +33,7 @@ # else # define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_EDG() | BOOST_PP_CONFIG_STRICT()) # endif -# elif defined(__clang__) && defined(__GNUC__) +# elif defined(_MSC_VER) && defined(__clang__) && defined(__GNUC__) // -fno-ms-compatibility mode # define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_STRICT()) # elif defined(__MWERKS__) # define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_MWCC()) @@ -73,7 +73,7 @@ # /* variadic support explicitly disabled for all untested compilers */ # if defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || ( defined __SUNPRO_CC && __SUNPRO_CC < 0x5120 ) || defined __HP_aCC && !defined __EDG__ || defined __MRC__ || defined __SC__ || defined __IBMCPP__ || defined __PGI # define BOOST_PP_VARIADICS 0 -# elif defined(__clang__) && defined(__GNUC__) +# elif defined(_MSC_VER) && defined(__clang__) && defined(__GNUC__) // -fno-ms-compatibility mode # define BOOST_PP_VARIADICS 1 # /* VC++ (C/C++) and Intel C++ Compiler >= 17.0 with MSVC */ # elif defined _MSC_VER && _MSC_VER >= 1400 && (defined(__clang__) || !defined __EDG__ || defined(__INTELLISENSE__) || defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1700)