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

Resolved symbol ambiguities.

Browse Source 
[SVN r38098]
This commit is contained in:
Hartmut Kaiser
2007-06-26 19:12:52 +00:00
parent 0b095e687f
commit 5bf5110cdb
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/boost/iterator/iterator_adaptor.hpp
View File

@ -110,7 +110,7 @@ namespace boost
is_same<From,To>
, is_convertible<From, To>
>
, detail::enable_type
, boost::detail::enable_type
, int&
>::type type;
};
@ -120,7 +120,7 @@ namespace boost
template <class From, class To>
struct enable_if_convertible
{
typedef detail::enable_type type;
typedef boost::detail::enable_type type;
};
# elif BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
@ -134,7 +134,7 @@ namespace boost
is_same<From,To>
, is_convertible<From, To>
>
, detail::enable_type
, boost::detail::enable_type
>
{};
@ -144,7 +144,7 @@ namespace boost
struct enable_if_convertible
: iterators::enable_if<
is_convertible<From, To>
, detail::enable_type
, boost::detail::enable_type
>
{};
@ -183,7 +183,7 @@ namespace boost
Derived
# ifdef BOOST_ITERATOR_REF_CONSTNESS_KILLS_WRITABILITY
, typename detail::ia_dflt_help<
, typename boost::detail::ia_dflt_help<
Value
, mpl::eval_if<
is_same<Reference,use_default>
@ -192,17 +192,17 @@ namespace boost
>
>::type
# else
, typename detail::ia_dflt_help<
, typename boost::detail::ia_dflt_help<
Value, iterator_value<Base>
>::type
# endif
, typename detail::ia_dflt_help<
, typename boost::detail::ia_dflt_help<
Traversal
, iterator_traversal<Base>
>::type
, typename detail::ia_dflt_help<
, typename boost::detail::ia_dflt_help<
Reference
, mpl::eval_if<
is_same<Value,use_default>
@ -211,7 +211,7 @@ namespace boost
>
>::type
, typename detail::ia_dflt_help<
, typename boost::detail::ia_dflt_help<
Difference, iterator_difference<Base>
>::type
>
@ -260,14 +260,14 @@ namespace boost
, class Difference = use_default
>
class iterator_adaptor
: public detail::iterator_adaptor_base<
: public boost::detail::iterator_adaptor_base<
Derived, Base, Value, Traversal, Reference, Difference
>::type
{
friend class iterator_core_access;
protected:
typedef typename detail::iterator_adaptor_base<
typedef typename boost::detail::iterator_adaptor_base<
Derived, Base, Value, Traversal, Reference, Difference
>::type super_t;
public:
@ -323,7 +323,7 @@ namespace boost
>::type my_traversal;
# define BOOST_ITERATOR_ADAPTOR_ASSERT_TRAVERSAL(cat) \
detail::iterator_adaptor_assert_traversal<my_traversal, cat>();
boost::detail::iterator_adaptor_assert_traversal<my_traversal, cat>();
void advance(typename super_t::difference_type n)
{

2
include/boost/iterator/iterator_categories.hpp
View File

@ -150,7 +150,7 @@ struct iterator_category_to_traversal
: mpl::eval_if< // if already convertible to a traversal tag, we're done.
is_convertible<Cat,incrementable_traversal_tag>
, mpl::identity<Cat>
, detail::old_category_to_traversal<Cat>
, boost::detail::old_category_to_traversal<Cat>
>
{};

34
include/boost/iterator/iterator_facade.hpp
View File

@ -106,7 +106,7 @@ namespace boost
typedef typename remove_const<ValueParam>::type value_type;
typedef typename mpl::eval_if<
detail::iterator_writability_disabled<ValueParam,Reference>
boost::detail::iterator_writability_disabled<ValueParam,Reference>
, add_pointer<const value_type>
, add_pointer<value_type>
>::type pointer;
@ -446,7 +446,7 @@ namespace boost
class Derived1, class V1, class TC1, class R1, class D1 \
, class Derived2, class V2, class TC2, class R2, class D2 \
> \
prefix typename detail::enable_if_interoperable< \
prefix typename boost::detail::enable_if_interoperable< \
Derived1, Derived2 \
, typename mpl::apply2<result_type,Derived1,Derived2>::type \
>::type \
@ -480,7 +480,7 @@ namespace boost
template <class I, class V, class TC, class R, class D> friend class iterator_facade;
# define BOOST_ITERATOR_FACADE_RELATION(op) \
BOOST_ITERATOR_FACADE_INTEROP_HEAD(friend,op, detail::always_bool2);
BOOST_ITERATOR_FACADE_INTEROP_HEAD(friend,op, boost::detail::always_bool2);
BOOST_ITERATOR_FACADE_RELATION(==)
BOOST_ITERATOR_FACADE_RELATION(!=)
@ -492,7 +492,7 @@ namespace boost
# undef BOOST_ITERATOR_FACADE_RELATION
BOOST_ITERATOR_FACADE_INTEROP_HEAD(
friend, -, detail::choose_difference_type)
friend, -, boost::detail::choose_difference_type)
;
BOOST_ITERATOR_FACADE_PLUS_HEAD(
@ -594,7 +594,7 @@ namespace boost
>
class iterator_facade
# ifdef BOOST_ITERATOR_FACADE_NEEDS_ITERATOR_BASE
: public detail::iterator_facade_types<
: public boost::detail::iterator_facade_types<
Value, CategoryOrTraversal, Reference, Difference
>::base
# undef BOOST_ITERATOR_FACADE_NEEDS_ITERATOR_BASE
@ -614,7 +614,7 @@ namespace boost
return *static_cast<Derived const*>(this);
}
typedef detail::iterator_facade_types<
typedef boost::detail::iterator_facade_types<
Value, CategoryOrTraversal, Reference, Difference
> associated_types;
@ -635,26 +635,26 @@ namespace boost
return iterator_core_access::dereference(this->derived());
}
typename detail::operator_arrow_result<
typename boost::detail::operator_arrow_result<
value_type
, reference
, pointer
>::type
operator->() const
{
return detail::operator_arrow_result<
return boost::detail::operator_arrow_result<
value_type
, reference
, pointer
>::make(*this->derived());
}
typename detail::operator_brackets_result<Derived,Value,reference>::type
typename boost::detail::operator_brackets_result<Derived,Value,reference>::type
operator[](difference_type n) const
{
typedef detail::use_operator_brackets_proxy<Value,Reference> use_proxy;
typedef boost::detail::use_operator_brackets_proxy<Value,Reference> use_proxy;
return detail::make_operator_brackets_result<Derived>(
return boost::detail::make_operator_brackets_result<Derived>(
this->derived() + n
, use_proxy()
);
@ -667,10 +667,10 @@ namespace boost
}
# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
typename detail::postfix_increment_result<Derived,Value,Reference,CategoryOrTraversal>::type
typename boost::detail::postfix_increment_result<Derived,Value,Reference,CategoryOrTraversal>::type
operator++(int)
{
typename detail::postfix_increment_result<Derived,Value,Reference,CategoryOrTraversal>::type
typename boost::detail::postfix_increment_result<Derived,Value,Reference,CategoryOrTraversal>::type
tmp(this->derived());
++*this;
return tmp;
@ -723,13 +723,13 @@ namespace boost
# if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
template <class I, class V, class TC, class R, class D>
inline typename detail::postfix_increment_result<I,V,R,TC>::type
inline typename boost::detail::postfix_increment_result<I,V,R,TC>::type
operator++(
iterator_facade<I,V,TC,R,D>& i
, int
)
{
typename detail::postfix_increment_result<I,V,R,TC>::type
typename boost::detail::postfix_increment_result<I,V,R,TC>::type
tmp(*static_cast<I*>(&i));
++i;
@ -829,7 +829,7 @@ namespace boost
# define BOOST_ITERATOR_FACADE_RELATION(op, return_prefix, base_op) \
BOOST_ITERATOR_FACADE_INTEROP( \
op \
, detail::always_bool2 \
, boost::detail::always_bool2 \
, return_prefix \
, base_op \
)
@ -846,7 +846,7 @@ namespace boost
// operator- requires an additional part in the static assertion
BOOST_ITERATOR_FACADE_INTEROP(
-
, detail::choose_difference_type
, boost::detail::choose_difference_type
, return
, distance_from
)

10
include/boost/iterator/iterator_traits.hpp
View File

@ -27,32 +27,32 @@ namespace boost {
template <class Iterator>
struct iterator_value
{
typedef typename detail::iterator_traits<Iterator>::value_type type;
typedef typename boost::detail::iterator_traits<Iterator>::value_type type;
};
template <class Iterator>
struct iterator_reference
{
typedef typename detail::iterator_traits<Iterator>::reference type;
typedef typename boost::detail::iterator_traits<Iterator>::reference type;
};
template <class Iterator>
struct iterator_pointer
{
typedef typename detail::iterator_traits<Iterator>::pointer type;
typedef typename boost::detail::iterator_traits<Iterator>::pointer type;
};
template <class Iterator>
struct iterator_difference
{
typedef typename detail::iterator_traits<Iterator>::difference_type type;
typedef typename boost::detail::iterator_traits<Iterator>::difference_type type;
};
template <class Iterator>
struct BOOST_ITERATOR_CATEGORY
{
typedef typename detail::iterator_traits<Iterator>::iterator_category type;
typedef typename boost::detail::iterator_traits<Iterator>::iterator_category type;
};
# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)

4
include/boost/iterator/transform_iterator.hpp
View File

@ -88,10 +88,10 @@ namespace boost
template <class UnaryFunc, class Iterator, class Reference, class Value>
class transform_iterator
: public detail::transform_iterator_base<UnaryFunc, Iterator, Reference, Value>::type
: public boost::detail::transform_iterator_base<UnaryFunc, Iterator, Reference, Value>::type
{
typedef typename
detail::transform_iterator_base<UnaryFunc, Iterator, Reference, Value>::type
boost::detail::transform_iterator_base<UnaryFunc, Iterator, Reference, Value>::type
super_t;
friend class iterator_core_access;