From f1d694c2d6c4c5b51a3c737e9001ba77042e8e0b Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Thu, 8 Jan 2004 14:58:22 +0000
Subject: [PATCH] merged from trunk

[SVN r21548]
---
 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 <class T1 = mpl::_1, class T2 = mpl::_2>
 struct minimum_category
 {
     typedef minimum_category_impl< 
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround
+        is_same<T2,int>::value ||
+# endif 
         ::boost::is_convertible<T1,T2>::value
       , ::boost::is_convertible<T2,T1>::value
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround
+        || is_same<T1,int>::value
+# endif 
     > outer;
       
     typedef typename outer::template apply<T1,T2> inner;
@@ -91,7 +97,7 @@ struct minimum_category<mpl::_1,mpl::_2>
     {};
 };
     
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround
 template <>
 struct minimum_category<int,int>
 {