feedc0de/boost_iterator
1
0
Fork 0
forked from boostorg/iterator
Code Pull Requests Activity

Merge pull request #14 from eldiener/develop

Browse Source 
Changed needed for type_traits version2 to remove icexxx.hpp dependencies.
This commit is contained in:
Edward Diener
2015-05-21 23:28:00 -04:00
parent db04fafe21 0dbbb61bec
commit 20dc7b1abe
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/boost/iterator/is_lvalue_iterator.hpp
View File

@ -12,9 +12,10 @@
#include <boost/type_traits/add_lvalue_reference.hpp> #include <boost/type_traits/add_lvalue_reference.hpp>
#include <boost/iterator/detail/any_conversion_eater.hpp> #include <boost/iterator/detail/any_conversion_eater.hpp>
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
#include <boost/mpl/aux_/lambda_support.hpp>
// should be the last #includes // should be the last #includes
#include <boost/type_traits/detail/bool_trait_def.hpp> #include <boost/type_traits/integral_constant.hpp>
#include <boost/iterator/detail/config_def.hpp> #include <boost/iterator/detail/config_def.hpp>
#ifndef BOOST_NO_IS_CONVERTIBLE #ifndef BOOST_NO_IS_CONVERTIBLE
@ -136,13 +137,19 @@ namespace detail
{}; {};
} // namespace detail } // namespace detail
// Define the trait with full mpl lambda capability and various broken template< typename T > struct is_lvalue_iterator
// compiler workarounds : public ::boost::integral_constant<bool,::boost::iterators::detail::is_readable_lvalue_iterator_impl<T>::value>
BOOST_TT_AUX_BOOL_TRAIT_DEF1( {
is_lvalue_iterator,T,::boost::iterators::detail::is_readable_lvalue_iterator_impl<T>::value) public:
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_lvalue_iterator,(T))
};
BOOST_TT_AUX_BOOL_TRAIT_DEF1( template< typename T > struct is_non_const_lvalue_iterator
is_non_const_lvalue_iterator,T,::boost::iterators::detail::is_non_const_lvalue_iterator_impl<T>::value) : public ::boost::integral_constant<bool,::boost::iterators::detail::is_non_const_lvalue_iterator_impl<T>::value>
{
public:
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_non_const_lvalue_iterator,(T))
};
} // namespace iterators } // namespace iterators

13
include/boost/iterator/is_readable_iterator.hpp
View File

@ -5,13 +5,14 @@
# define IS_READABLE_ITERATOR_DWA2003112_HPP # define IS_READABLE_ITERATOR_DWA2003112_HPP
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
#include <boost/mpl/aux_/lambda_support.hpp>
#include <boost/detail/iterator.hpp> #include <boost/detail/iterator.hpp>
#include <boost/type_traits/add_lvalue_reference.hpp> #include <boost/type_traits/add_lvalue_reference.hpp>
#include <boost/type_traits/detail/bool_trait_def.hpp>
#include <boost/iterator/detail/any_conversion_eater.hpp> #include <boost/iterator/detail/any_conversion_eater.hpp>
// should be the last #include // should be the last #include
#include <boost/type_traits/integral_constant.hpp>
#include <boost/iterator/detail/config_def.hpp> #include <boost/iterator/detail/config_def.hpp>
#ifndef BOOST_NO_IS_CONVERTIBLE #ifndef BOOST_NO_IS_CONVERTIBLE
@ -97,10 +98,12 @@ namespace detail
{}; {};
} // namespace detail } // namespace detail
// Define the trait with full mpl lambda capability and various broken template< typename T > struct is_readable_iterator
// compiler workarounds : public ::boost::integral_constant<bool,::boost::iterators::detail::is_readable_iterator_impl2<T>::value>
BOOST_TT_AUX_BOOL_TRAIT_DEF1( {
is_readable_iterator,T,::boost::iterators::detail::is_readable_iterator_impl2<T>::value) public:
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_readable_iterator,(T))
};
} // namespace iterators } // namespace iterators