diff options
Diffstat (limited to 'boost/atomic/detail/type_traits/conditional.hpp')
| -rw-r--r-- | boost/atomic/detail/type_traits/conditional.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/boost/atomic/detail/type_traits/conditional.hpp b/boost/atomic/detail/type_traits/conditional.hpp index 71397ab154..6b9e896729 100644 --- a/boost/atomic/detail/type_traits/conditional.hpp +++ b/boost/atomic/detail/type_traits/conditional.hpp @@ -15,7 +15,7 @@ #define BOOST_ATOMIC_DETAIL_TYPE_TRAITS_CONDITIONAL_HPP_INCLUDED_ #include <boost/atomic/detail/config.hpp> -#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_HDR_TYPE_TRAITS) +#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_BASIC_HDR_TYPE_TRAITS) #include <type_traits> #else #include <boost/type_traits/conditional.hpp> @@ -29,7 +29,7 @@ namespace boost { namespace atomics { namespace detail { -#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_HDR_TYPE_TRAITS) +#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_BASIC_HDR_TYPE_TRAITS) using std::conditional; #else using boost::conditional; |