boost_mirror/iterator
1
0
Fork 0
mirror of https://github.com/boostorg/iterator.git synced 2025-05-12 05:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed for VC7.1

Browse Source 
[SVN r14433]
This commit is contained in:
Dave Abrahams 2002-07-13 12:11:06 +00:00
parent 3844edc4bf
commit 4a24e0f401
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/boost/iterator_adaptors.hpp
View File

@ -147,7 +147,7 @@ namespace boost {
template <class Policies, class Adapted, class Traits> template <class Policies, class Adapted, class Traits>
struct TrivialIteratorPoliciesConcept struct TrivialIteratorPoliciesConcept
{ {
typedef typename Traits::reference Reference; typedef typename Traits::reference reference;
void constraints() { void constraints() {
function_requires< AssignableConcept<Policies> >(); function_requires< AssignableConcept<Policies> >();
function_requires< DefaultConstructibleConcept<Policies> >(); function_requires< DefaultConstructibleConcept<Policies> >();
@ -157,7 +157,7 @@ struct TrivialIteratorPoliciesConcept
const_constraints(); const_constraints();
} }
void const_constraints() const { void const_constraints() const {
Reference r = p.dereference(x); reference r = p.dereference(x);
b = p.equal(x, x); b = p.equal(x, x);
ignore_unused_variable_warning(r); ignore_unused_variable_warning(r);
} }
@ -766,7 +766,7 @@ namespace detail {
// This macro definition is only temporary in this file // This macro definition is only temporary in this file
# if !defined(BOOST_MSVC) # if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
# define BOOST_ARG_DEPENDENT_TYPENAME typename # define BOOST_ARG_DEPENDENT_TYPENAME typename
# else # else
# define BOOST_ARG_DEPENDENT_TYPENAME # define BOOST_ARG_DEPENDENT_TYPENAME
@ -855,9 +855,9 @@ struct iterator_adaptor :
policies().initialize(base()); policies().initialize(base());
} }
#if defined(BOOST_MSVC) || defined(__BORLANDC__) #if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__BORLANDC__)
// This is required to prevent a bug in how VC++ generates // This is required to prevent a bug in how VC++ generates
// the assignment operator for compressed_pairv // the assignment operator for compressed_pair
iterator_adaptor& operator= (const iterator_adaptor& x) { iterator_adaptor& operator= (const iterator_adaptor& x) {
m_iter_p = x.m_iter_p; m_iter_p = x.m_iter_p;
return *this; return *this;
@ -1097,7 +1097,7 @@ struct indirect_iterator_policies : public default_iterator_policies
}; };
namespace detail { namespace detail {
# if !defined(BOOST_MSVC) // stragely instantiated even when unused! Maybe try a recursive template someday ;-) # if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // strangely instantiated even when unused! Maybe try a recursive template someday ;-)
template <class T> template <class T>
struct traits_of_value_type { struct traits_of_value_type {
typedef typename boost::detail::iterator_traits<T>::value_type outer_value; typedef typename boost::detail::iterator_traits<T>::value_type outer_value;
@ -1110,12 +1110,12 @@ namespace detail {
template <class OuterIterator, // Mutable or Immutable, does not matter template <class OuterIterator, // Mutable or Immutable, does not matter
class Value class Value
#if !defined(BOOST_MSVC) #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
= BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type< = BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type<
OuterIterator>::value_type OuterIterator>::value_type
#endif #endif
, class Reference , class Reference
#if !defined(BOOST_MSVC) #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
= BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type< = BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type<
OuterIterator>::reference OuterIterator>::reference
#else #else
@ -1124,7 +1124,7 @@ template <class OuterIterator, // Mutable or Immutable, does not matter
, class Category = BOOST_ARG_DEPENDENT_TYPENAME boost::detail::iterator_traits< , class Category = BOOST_ARG_DEPENDENT_TYPENAME boost::detail::iterator_traits<
OuterIterator>::iterator_category OuterIterator>::iterator_category
, class Pointer , class Pointer
#if !defined(BOOST_MSVC) #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
= BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type< = BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type<
OuterIterator>::pointer OuterIterator>::pointer
#else #else
@ -1139,12 +1139,12 @@ struct indirect_iterator_generator
template <class OuterIterator, // Mutable or Immutable, does not matter template <class OuterIterator, // Mutable or Immutable, does not matter
class Value class Value
#if !defined(BOOST_MSVC) #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
= BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type< = BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type<
OuterIterator>::value_type OuterIterator>::value_type
#endif #endif
, class Reference , class Reference
#if !defined(BOOST_MSVC) #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
= BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type< = BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type<
OuterIterator>::reference OuterIterator>::reference
#else #else
@ -1154,7 +1154,7 @@ template <class OuterIterator, // Mutable or Immutable, does not matter
, class Category = BOOST_ARG_DEPENDENT_TYPENAME boost::detail::iterator_traits< , class Category = BOOST_ARG_DEPENDENT_TYPENAME boost::detail::iterator_traits<
OuterIterator>::iterator_category OuterIterator>::iterator_category
, class Pointer , class Pointer
#if !defined(BOOST_MSVC) #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
= BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type< = BOOST_ARG_DEPENDENT_TYPENAME detail::traits_of_value_type<
OuterIterator>::pointer OuterIterator>::pointer
#else #else
@ -1170,7 +1170,7 @@ struct indirect_iterator_pair_generator
Value, ConstReference,Category,ConstPointer>::type const_iterator; Value, ConstReference,Category,ConstPointer>::type const_iterator;
}; };
#ifndef BOOST_MSVC #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
template <class OuterIterator> template <class OuterIterator>
inline typename indirect_iterator_generator<OuterIterator>::type inline typename indirect_iterator_generator<OuterIterator>::type
make_indirect_iterator(OuterIterator base) make_indirect_iterator(OuterIterator base)
@ -1392,7 +1392,7 @@ template <class Predicate, class Iterator,
class filter_iterator_generator { class filter_iterator_generator {
BOOST_STATIC_CONSTANT(bool, is_bidirectional BOOST_STATIC_CONSTANT(bool, is_bidirectional
= (boost::is_convertible<Category*, std::bidirectional_iterator_tag*>::value)); = (boost::is_convertible<Category*, std::bidirectional_iterator_tag*>::value));
#ifndef BOOST_MSVC // I don't have any idea why this occurs, but it doesn't seem to hurt too badly. #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // I don't have any idea why this occurs, but it doesn't seem to hurt too badly.
BOOST_STATIC_ASSERT(!is_bidirectional); BOOST_STATIC_ASSERT(!is_bidirectional);
#endif #endif
typedef filter_iterator_policies<Predicate,Iterator> policies_type; typedef filter_iterator_policies<Predicate,Iterator> policies_type;