mirror of
https://github.com/boostorg/iterator.git
synced 2025-07-29 20:37:17 +02:00
Workaround vc7.1 bug
[SVN r21223]
This commit is contained in:
@ -24,8 +24,13 @@
|
|||||||
#include <boost/type_traits/remove_const.hpp>
|
#include <boost/type_traits/remove_const.hpp>
|
||||||
#include <boost/type_traits/remove_reference.hpp>
|
#include <boost/type_traits/remove_reference.hpp>
|
||||||
|
|
||||||
|
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310))
|
||||||
|
# include <boost/type_traits/is_base_and_derived.hpp>
|
||||||
|
|
||||||
|
#endif
|
||||||
#include <boost/iterator/detail/config_def.hpp>
|
#include <boost/iterator/detail/config_def.hpp>
|
||||||
|
|
||||||
|
|
||||||
namespace boost
|
namespace boost
|
||||||
{
|
{
|
||||||
template <class UnaryFunction, class Iterator, class Reference = use_default, class Value = use_default>
|
template <class UnaryFunction, class Iterator, class Reference = use_default, class Value = use_default>
|
||||||
@ -119,7 +124,9 @@ namespace boost
|
|||||||
transform_iterator(
|
transform_iterator(
|
||||||
transform_iterator<OtherUnaryFunction, OtherIterator, OtherReference, OtherValue> const& t
|
transform_iterator<OtherUnaryFunction, OtherIterator, OtherReference, OtherValue> const& t
|
||||||
, typename enable_if_convertible<OtherIterator, Iterator>::type* = 0
|
, typename enable_if_convertible<OtherIterator, Iterator>::type* = 0
|
||||||
|
#if 1 // !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310))
|
||||||
, typename enable_if_convertible<OtherUnaryFunction, UnaryFunction>::type* = 0
|
, typename enable_if_convertible<OtherUnaryFunction, UnaryFunction>::type* = 0
|
||||||
|
#endif
|
||||||
)
|
)
|
||||||
: super_t(t.base()), m_f(t.functor())
|
: super_t(t.base()), m_f(t.functor())
|
||||||
{}
|
{}
|
||||||
|
Reference in New Issue
Block a user