mirror of
https://github.com/boostorg/iterator.git
synced 2025-05-10 07:33:53 +00:00
Switched enable_if from MPL to TypeTraits.
This commit is contained in:
parent
e4ab917f79
commit
75ba1a50c9
@ -7,10 +7,11 @@
|
|||||||
#ifndef BOOST_ENABLE_IF_23022003THW_HPP
|
#ifndef BOOST_ENABLE_IF_23022003THW_HPP
|
||||||
#define BOOST_ENABLE_IF_23022003THW_HPP
|
#define BOOST_ENABLE_IF_23022003THW_HPP
|
||||||
|
|
||||||
#include <boost/detail/workaround.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <boost/mpl/identity.hpp>
|
|
||||||
|
|
||||||
#include <boost/iterator/detail/config_def.hpp>
|
#include <boost/iterator/detail/config_def.hpp>
|
||||||
|
#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_IS_CONVERTIBLE)
|
||||||
|
#include <boost/type_traits/type_identity.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
// Boost iterators uses its own enable_if cause we need
|
// Boost iterators uses its own enable_if cause we need
|
||||||
@ -48,7 +49,6 @@ namespace boost
|
|||||||
struct base
|
struct base
|
||||||
{
|
{
|
||||||
#ifdef BOOST_NO_SFINAE
|
#ifdef BOOST_NO_SFINAE
|
||||||
|
|
||||||
typedef T type;
|
typedef T type;
|
||||||
|
|
||||||
// This way to do it would give a nice error message containing
|
// This way to do it would give a nice error message containing
|
||||||
@ -69,7 +69,7 @@ namespace boost
|
|||||||
# if !defined(BOOST_NO_SFINAE) && !defined(BOOST_NO_IS_CONVERTIBLE)
|
# if !defined(BOOST_NO_SFINAE) && !defined(BOOST_NO_IS_CONVERTIBLE)
|
||||||
: enabled<(Cond::value)>::template base<Return>
|
: enabled<(Cond::value)>::template base<Return>
|
||||||
# else
|
# else
|
||||||
: mpl::identity<Return>
|
: boost::type_identity<Return>
|
||||||
# endif
|
# endif
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user