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

Repair VC7.1 is_convertible checks

Browse Source 
[SVN r858]
This commit is contained in:
Dave Abrahams
2003-01-14 23:22:52 +00:00
parent 30a6b03a93
commit ab750320d3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/iterator/iterator_adaptors.hpp
View File

@@ -30,9 +30,7 @@
# define BOOST_ARG_DEP_TYPENAME typename # define BOOST_ARG_DEP_TYPENAME typename
#endif #endif
// CWPro7 never works, and unfortunately vc7.1 final beta sometimes fails #if BOOST_WORKAROUND(__MWERKS__, <=0x2407)
#if BOOST_WORKAROUND(__MWERKS__, <=0x2407) \
|| BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292) && BOOST_MSVC > 1300)
# define BOOST_NO_IS_CONVERTIBLE // "is_convertible doesn't always work" # define BOOST_NO_IS_CONVERTIBLE // "is_convertible doesn't always work"
#endif #endif
@@ -109,7 +107,7 @@ namespace boost
// //
template <typename A, typename B> template <typename A, typename B>
struct is_interoperable struct is_interoperable
#if defined(BOOST_NO_IS_CONVERTIBLE) && !(BOOST_MSVC > 1300) // vc7.1 is_convertible works sometimes #if defined(BOOST_NO_IS_CONVERTIBLE)
: mpl::true_c : mpl::true_c
#else #else
: mpl::logical_or< : mpl::logical_or<
@@ -221,11 +219,17 @@ namespace boost
{ {
// Borland 551 and vc6 have a problem with the use of base class // Borland 551 and vc6 have a problem with the use of base class
// forwarding in this template, so we write it all out here // forwarding in this template, so we write it all out here
#if defined(BOOST_NO_IS_CONVERTIBLE) || defined(BOOST_NO_SFINAE) # if defined(BOOST_NO_IS_CONVERTIBLE) || defined(BOOST_NO_SFINAE)
typedef detail::enable_type type; typedef detail::enable_type type;
# else # else
typedef typename detail::enabled< typedef typename detail::enabled<
# if BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292) && BOOST_MSVC > 1300)
// For some reason vc7.1 needs us to "cut off" instantiation
// of is_convertible in the case where From == To.
mpl::logical_or<is_same<From,To>, is_convertible<From, To> >::value
# else
::boost::is_convertible<From, To>::value ::boost::is_convertible<From, To>::value
# endif
>::template base<detail::enable_type>::type type; >::template base<detail::enable_type>::type type;
# endif # endif
}; };