From 1c26f7dd436920f062b14eaeb477668f031b4155 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Thu, 8 Jan 2004 14:57:59 +0000 Subject: [PATCH] ETI workarounds for vc6 [SVN r21547] --- include/boost/iterator/detail/minimum_category.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/boost/iterator/detail/minimum_category.hpp b/include/boost/iterator/detail/minimum_category.hpp index d56ab9a..89d79db 100755 --- a/include/boost/iterator/detail/minimum_category.hpp +++ b/include/boost/iterator/detail/minimum_category.hpp @@ -73,8 +73,14 @@ template struct minimum_category { typedef minimum_category_impl< +# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround + is_same::value || +# endif ::boost::is_convertible::value , ::boost::is_convertible::value +# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround + || is_same::value +# endif > outer; typedef typename outer::template apply inner; @@ -91,7 +97,7 @@ struct minimum_category {}; }; -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround template <> struct minimum_category {