diff --git a/include/boost/unordered/detail/fwd.hpp b/include/boost/unordered/detail/fwd.hpp index 6a842042..0e725d7c 100644 --- a/include/boost/unordered/detail/fwd.hpp +++ b/include/boost/unordered/detail/fwd.hpp @@ -20,7 +20,7 @@ #endif #elif defined(_LIBCPP_VERSION) // https://github.com/llvm-mirror/libcxx/blob/release_30/include/utility#L206 -#if LIBCPP_VERSION >= 3000 +#if _LIBCPP_VERSION >= 3000 #define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1 #endif #elif defined(BOOST_MSVC) diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp index d436613b..f7998380 100644 --- a/include/boost/unordered/detail/implementation.hpp +++ b/include/boost/unordered/detail/implementation.hpp @@ -120,8 +120,10 @@ #define BOOST_UNORDERED_TUPLE_ARGS 0 #elif !defined(BOOST_NO_CXX11_HDR_TUPLE) #define BOOST_UNORDERED_TUPLE_ARGS 10 -#elif BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT -#if defined(BOOST_MSVC) && defined(_VARIADIC_MAX) +#elif defined(BOOST_MSVC) +#if !BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT +#define BOOST_UNORDERED_TUPLE_ARGS 0 +#elif defined(_VARIADIC_MAX) #define BOOST_UNORDERED_TUPLE_ARGS _VARIADIC_MAX #else #define BOOST_UNORDERED_TUPLE_ARGS 5