mirror of
https://github.com/boostorg/iterator.git
synced 2025-05-12 05:51:37 +00:00
Fix missing is_readable_iterator test
Fix naming for is_lvalue_iterator and is_mutable_lvalue_iterator [SVN r20772]
This commit is contained in:
parent
f8cd96cb2e
commit
cb34b65f3f
@ -126,7 +126,7 @@ namespace detail
|
|||||||
{};
|
{};
|
||||||
|
|
||||||
template <class It>
|
template <class It>
|
||||||
struct is_writable_lvalue_iterator_impl
|
struct is_mutable_lvalue_iterator_impl
|
||||||
: is_lvalue_iterator_impl<
|
: is_lvalue_iterator_impl<
|
||||||
BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<It>::value_type
|
BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<It>::value_type
|
||||||
>::template rebind<It>
|
>::template rebind<It>
|
||||||
@ -136,10 +136,10 @@ namespace detail
|
|||||||
// Define the trait with full mpl lambda capability and various broken
|
// Define the trait with full mpl lambda capability and various broken
|
||||||
// compiler workarounds
|
// compiler workarounds
|
||||||
BOOST_TT_AUX_BOOL_TRAIT_DEF1(
|
BOOST_TT_AUX_BOOL_TRAIT_DEF1(
|
||||||
is_readable_lvalue_iterator,T,::boost::detail::is_readable_lvalue_iterator_impl<T>::value)
|
is_lvalue_iterator,T,::boost::detail::is_readable_lvalue_iterator_impl<T>::value)
|
||||||
|
|
||||||
BOOST_TT_AUX_BOOL_TRAIT_DEF1(
|
BOOST_TT_AUX_BOOL_TRAIT_DEF1(
|
||||||
is_writable_lvalue_iterator,T,::boost::detail::is_writable_lvalue_iterator_impl<T>::value)
|
is_mutable_lvalue_iterator,T,::boost::detail::is_mutable_lvalue_iterator_impl<T>::value)
|
||||||
|
|
||||||
} // namespace boost
|
} // namespace boost
|
||||||
|
|
||||||
|
108
include/boost/iterator/is_readable_iterator.hpp
Executable file
108
include/boost/iterator/is_readable_iterator.hpp
Executable file
@ -0,0 +1,108 @@
|
|||||||
|
// Copyright David Abrahams 2003. Use, modification and distribution is
|
||||||
|
// subject to the Boost Software License, Version 1.0. (See accompanying
|
||||||
|
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
#ifndef IS_READABLE_ITERATOR_DWA2003112_HPP
|
||||||
|
# define IS_READABLE_ITERATOR_DWA2003112_HPP
|
||||||
|
|
||||||
|
#include <boost/mpl/bool.hpp>
|
||||||
|
#include <boost/detail/iterator.hpp>
|
||||||
|
|
||||||
|
// should be the last #include
|
||||||
|
#include <boost/type_traits/detail/bool_trait_def.hpp>
|
||||||
|
#include <boost/iterator/detail/config_def.hpp>
|
||||||
|
|
||||||
|
namespace boost {
|
||||||
|
|
||||||
|
namespace detail
|
||||||
|
{
|
||||||
|
struct any_conversion_eater
|
||||||
|
{
|
||||||
|
template <class T>
|
||||||
|
any_conversion_eater(T const&);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Guts of is_readable_iterator. Value is the iterator's value_type
|
||||||
|
// and the result is computed in the nested rebind template.
|
||||||
|
template <class Value>
|
||||||
|
struct is_readable_iterator_impl
|
||||||
|
{
|
||||||
|
static char tester(Value&, int);
|
||||||
|
static char (& tester(any_conversion_eater, ...) )[2];
|
||||||
|
|
||||||
|
template <class It>
|
||||||
|
struct rebind
|
||||||
|
{
|
||||||
|
static It& x;
|
||||||
|
|
||||||
|
BOOST_STATIC_CONSTANT(
|
||||||
|
bool
|
||||||
|
, value = (
|
||||||
|
sizeof(
|
||||||
|
is_readable_iterator_impl<Value>::tester(*x, 1)
|
||||||
|
) == 1
|
||||||
|
)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
#undef BOOST_READABLE_PRESERVER
|
||||||
|
|
||||||
|
//
|
||||||
|
// void specializations to handle std input and output iterators
|
||||||
|
//
|
||||||
|
template <>
|
||||||
|
struct is_readable_iterator_impl<void>
|
||||||
|
{
|
||||||
|
template <class It>
|
||||||
|
struct rebind : boost::mpl::false_
|
||||||
|
{};
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifndef BOOST_NO_CV_VOID_SPECIALIZATIONS
|
||||||
|
template <>
|
||||||
|
struct is_readable_iterator_impl<const void>
|
||||||
|
{
|
||||||
|
template <class It>
|
||||||
|
struct rebind : boost::mpl::false_
|
||||||
|
{};
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct is_readable_iterator_impl<volatile void>
|
||||||
|
{
|
||||||
|
template <class It>
|
||||||
|
struct rebind : boost::mpl::false_
|
||||||
|
{};
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct is_readable_iterator_impl<const volatile void>
|
||||||
|
{
|
||||||
|
template <class It>
|
||||||
|
struct rebind : boost::mpl::false_
|
||||||
|
{};
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//
|
||||||
|
// This level of dispatching is required for Borland. We might save
|
||||||
|
// an instantiation by removing it for others.
|
||||||
|
//
|
||||||
|
template <class It>
|
||||||
|
struct is_readable_iterator_impl2
|
||||||
|
: is_readable_iterator_impl<
|
||||||
|
BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<It>::value_type const
|
||||||
|
>::template rebind<It>
|
||||||
|
{};
|
||||||
|
} // namespace detail
|
||||||
|
|
||||||
|
// Define the trait with full mpl lambda capability and various broken
|
||||||
|
// compiler workarounds
|
||||||
|
BOOST_TT_AUX_BOOL_TRAIT_DEF1(
|
||||||
|
is_readable_iterator,T,::boost::detail::is_readable_iterator_impl2<T>::value)
|
||||||
|
|
||||||
|
} // namespace boost
|
||||||
|
|
||||||
|
#include <boost/iterator/detail/config_undef.hpp>
|
||||||
|
|
||||||
|
#endif // IS_READABLE_ITERATOR_DWA2003112_HPP
|
@ -56,32 +56,32 @@ BOOST_TT_BROKEN_COMPILER_SPEC(proxy_iterator::proxy)
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
BOOST_STATIC_ASSERT(boost::is_readable_lvalue_iterator<v*>::value);
|
BOOST_STATIC_ASSERT(boost::is_lvalue_iterator<v*>::value);
|
||||||
BOOST_STATIC_ASSERT(boost::is_readable_lvalue_iterator<v const*>::value);
|
BOOST_STATIC_ASSERT(boost::is_lvalue_iterator<v const*>::value);
|
||||||
BOOST_STATIC_ASSERT(boost::is_readable_lvalue_iterator<std::deque<v>::iterator>::value);
|
BOOST_STATIC_ASSERT(boost::is_lvalue_iterator<std::deque<v>::iterator>::value);
|
||||||
BOOST_STATIC_ASSERT(boost::is_readable_lvalue_iterator<std::deque<v>::const_iterator>::value);
|
BOOST_STATIC_ASSERT(boost::is_lvalue_iterator<std::deque<v>::const_iterator>::value);
|
||||||
BOOST_STATIC_ASSERT(!boost::is_readable_lvalue_iterator<std::back_insert_iterator<std::deque<v> > >::value);
|
BOOST_STATIC_ASSERT(!boost::is_lvalue_iterator<std::back_insert_iterator<std::deque<v> > >::value);
|
||||||
BOOST_STATIC_ASSERT(!boost::is_readable_lvalue_iterator<std::ostream_iterator<v> >::value);
|
BOOST_STATIC_ASSERT(!boost::is_lvalue_iterator<std::ostream_iterator<v> >::value);
|
||||||
BOOST_STATIC_ASSERT(!boost::is_readable_lvalue_iterator<proxy_iterator>::value);
|
BOOST_STATIC_ASSERT(!boost::is_lvalue_iterator<proxy_iterator>::value);
|
||||||
#ifndef BOOST_NO_LVALUE_RETURN_DETECTION
|
#ifndef BOOST_NO_LVALUE_RETURN_DETECTION
|
||||||
BOOST_STATIC_ASSERT(!boost::is_readable_lvalue_iterator<value_iterator>::value);
|
BOOST_STATIC_ASSERT(!boost::is_lvalue_iterator<value_iterator>::value);
|
||||||
#endif
|
#endif
|
||||||
// Make sure inaccessible copy constructor doesn't prevent
|
// Make sure inaccessible copy constructor doesn't prevent
|
||||||
// reference binding
|
// reference binding
|
||||||
BOOST_STATIC_ASSERT(boost::is_readable_lvalue_iterator<noncopyable_iterator>::value);
|
BOOST_STATIC_ASSERT(boost::is_lvalue_iterator<noncopyable_iterator>::value);
|
||||||
|
|
||||||
|
|
||||||
BOOST_STATIC_ASSERT(boost::is_writable_lvalue_iterator<v*>::value);
|
BOOST_STATIC_ASSERT(boost::is_mutable_lvalue_iterator<v*>::value);
|
||||||
BOOST_STATIC_ASSERT(!boost::is_writable_lvalue_iterator<v const*>::value);
|
BOOST_STATIC_ASSERT(!boost::is_mutable_lvalue_iterator<v const*>::value);
|
||||||
BOOST_STATIC_ASSERT(boost::is_writable_lvalue_iterator<std::deque<v>::iterator>::value);
|
BOOST_STATIC_ASSERT(boost::is_mutable_lvalue_iterator<std::deque<v>::iterator>::value);
|
||||||
BOOST_STATIC_ASSERT(!boost::is_writable_lvalue_iterator<std::deque<v>::const_iterator>::value);
|
BOOST_STATIC_ASSERT(!boost::is_mutable_lvalue_iterator<std::deque<v>::const_iterator>::value);
|
||||||
BOOST_STATIC_ASSERT(!boost::is_writable_lvalue_iterator<std::back_insert_iterator<std::deque<v> > >::value);
|
BOOST_STATIC_ASSERT(!boost::is_mutable_lvalue_iterator<std::back_insert_iterator<std::deque<v> > >::value);
|
||||||
BOOST_STATIC_ASSERT(!boost::is_writable_lvalue_iterator<std::ostream_iterator<v> >::value);
|
BOOST_STATIC_ASSERT(!boost::is_mutable_lvalue_iterator<std::ostream_iterator<v> >::value);
|
||||||
BOOST_STATIC_ASSERT(!boost::is_writable_lvalue_iterator<proxy_iterator>::value);
|
BOOST_STATIC_ASSERT(!boost::is_mutable_lvalue_iterator<proxy_iterator>::value);
|
||||||
#ifndef BOOST_NO_LVALUE_RETURN_DETECTION
|
#ifndef BOOST_NO_LVALUE_RETURN_DETECTION
|
||||||
BOOST_STATIC_ASSERT(!boost::is_writable_lvalue_iterator<value_iterator>::value);
|
BOOST_STATIC_ASSERT(!boost::is_mutable_lvalue_iterator<value_iterator>::value);
|
||||||
#endif
|
#endif
|
||||||
BOOST_STATIC_ASSERT(!boost::is_writable_lvalue_iterator<noncopyable_iterator>::value);
|
BOOST_STATIC_ASSERT(!boost::is_mutable_lvalue_iterator<noncopyable_iterator>::value);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user