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

Merging fixes to release; fixes #2294 fixes #4918 fixes #3645 refs #2823 refs #1427 refs #2893

Browse Source 
[SVN r67792]
This commit is contained in:
Marshall Clow
2011-01-08 18:38:08 +00:00
parent de4ef14f9b
commit 36565eae63
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,7 @@ namespace boost
typedef typename remove_const<ValueParam>::type value_type; typedef typename remove_const<ValueParam>::type value_type;
// Not the real associated pointer type
typedef typename mpl::eval_if< typedef typename mpl::eval_if<
boost::detail::iterator_writability_disabled<ValueParam,Reference> boost::detail::iterator_writability_disabled<ValueParam,Reference>
, add_pointer<const value_type> , add_pointer<const value_type>
@ -323,7 +324,7 @@ namespace boost
static type make(Reference x) static type make(Reference x)
{ {
return implicit_cast<type>(&x); return boost::implicit_cast<type>(&x);
} }
}; };
@ -617,6 +618,12 @@ namespace boost
Value, CategoryOrTraversal, Reference, Difference Value, CategoryOrTraversal, Reference, Difference
> associated_types; > associated_types;
typedef boost::detail::operator_arrow_result<
typename associated_types::value_type
, Reference
, typename associated_types::pointer
> pointer_;
protected: protected:
// For use by derived classes // For use by derived classes
typedef iterator_facade<Derived,Value,CategoryOrTraversal,Reference,Difference> iterator_facade_; typedef iterator_facade<Derived,Value,CategoryOrTraversal,Reference,Difference> iterator_facade_;
@ -626,7 +633,9 @@ namespace boost
typedef typename associated_types::value_type value_type; typedef typename associated_types::value_type value_type;
typedef Reference reference; typedef Reference reference;
typedef Difference difference_type; typedef Difference difference_type;
typedef typename associated_types::pointer pointer;
typedef typename pointer_::type pointer;
typedef typename associated_types::iterator_category iterator_category; typedef typename associated_types::iterator_category iterator_category;
reference operator*() const reference operator*() const
@ -634,18 +643,9 @@ namespace boost
return iterator_core_access::dereference(this->derived()); return iterator_core_access::dereference(this->derived());
} }
typename boost::detail::operator_arrow_result< pointer operator->() const
value_type
, reference
, pointer
>::type
operator->() const
{ {
return boost::detail::operator_arrow_result< return pointer_::make(*this->derived());
value_type
, reference
, pointer
>::make(*this->derived());
} }
typename boost::detail::operator_brackets_result<Derived,Value,reference>::type typename boost::detail::operator_brackets_result<Derived,Value,reference>::type