From 7da9dbb7a9582c8a6df9636f3c6063ae781a5bf4 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Fri, 2 May 2014 02:59:10 -0400 Subject: [PATCH] Corrected calculation _msc_ver number. --- include/boost/preprocessor/array/detail/get_data.hpp | 4 ++-- include/boost/preprocessor/tuple/rem.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/preprocessor/array/detail/get_data.hpp b/include/boost/preprocessor/array/detail/get_data.hpp index d978109..fafa498 100644 --- a/include/boost/preprocessor/array/detail/get_data.hpp +++ b/include/boost/preprocessor/array/detail/get_data.hpp @@ -15,7 +15,7 @@ # include # include # -# if BOOST_PP_VARIADICS && BOOST_PP_VARIADICS_MSVC && _MSC_VER != 1400 +# if BOOST_PP_VARIADICS && BOOST_PP_VARIADICS_MSVC && _MSC_VER > 1400 # include # include # include @@ -45,6 +45,6 @@ /**/ # else # define BOOST_PP_ARRAY_DETAIL_GET_DATA(size, data) BOOST_PP_TUPLE_REM(size) data -# endif /* BOOST_PP_VARIADICS && BOOST_PP_VARIADICS_MSVC && _MSC_VER != 1400 */ +# endif /* BOOST_PP_VARIADICS && BOOST_PP_VARIADICS_MSVC && _MSC_VER > 1400 */ # # endif /* BOOST_PREPROCESSOR_ARRAY_DETAIL_GET_DATA_HPP */ diff --git a/include/boost/preprocessor/tuple/rem.hpp b/include/boost/preprocessor/tuple/rem.hpp index 136d282..78e47fe 100644 --- a/include/boost/preprocessor/tuple/rem.hpp +++ b/include/boost/preprocessor/tuple/rem.hpp @@ -37,7 +37,7 @@ /* VC++8.0 cannot handle the variadic version of BOOST_PP_TUPLE_REM(size) */ -# if BOOST_PP_VARIADICS && !(BOOST_PP_VARIADICS_MSVC && _MSC_VER == 1400) +# if BOOST_PP_VARIADICS && !(BOOST_PP_VARIADICS_MSVC && _MSC_VER <= 1400) # if BOOST_PP_VARIADICS_MSVC /* To be used internally when the size is 1 */ # define BOOST_PP_TUPLE_REM_CAT(size) BOOST_PP_REM_CAT