diff --git a/include/boost/core/pointer_traits.hpp b/include/boost/core/pointer_traits.hpp index 7c257f3..1923f4d 100644 --- a/include/boost/core/pointer_traits.hpp +++ b/include/boost/core/pointer_traits.hpp @@ -9,9 +9,7 @@ Distributed under the Boost Software License, Version 1.0. #define BOOST_CORE_POINTER_TRAITS_HPP #include -#include -#if !defined(BOOST_NO_CXX11_ALLOCATOR) && \ - !BOOST_WORKAROUND(BOOST_MSVC, < 1910) +#if !defined(BOOST_NO_CXX11_POINTER_TRAITS) #include #else #include @@ -33,8 +31,7 @@ ptr_traits_address(U v) BOOST_NOEXCEPT } /* detail */ -#if !defined(BOOST_NO_CXX11_ALLOCATOR) && \ - !BOOST_WORKAROUND(BOOST_MSVC, < 1910) +#if !defined(BOOST_NO_CXX11_POINTER_TRAITS) template struct pointer_traits : std::pointer_traits { @@ -72,7 +69,7 @@ private: template static char call(typename U::element_type* = 0); public: - BOOST_STATIC_CONSTEXPR bool value = sizeof(call(0)) == 1; + static const bool value = sizeof(call(0)) == 1; }; template @@ -118,7 +115,7 @@ private: template static char call(typename U::difference_type* = 0); public: - BOOST_STATIC_CONSTEXPR bool value = sizeof(call(0)) == 1; + static const bool value = sizeof(call(0)) == 1; }; template::value> @@ -139,7 +136,7 @@ private: template static char call(typename U::template rebind* = 0); public: - BOOST_STATIC_CONSTEXPR bool value = sizeof(call(0)) == 1; + static const bool value = sizeof(call(0)) == 1; }; template