From b502873f002f13247922216148b1f277e55297ce Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Tue, 27 Jan 2004 12:42:59 +0000
Subject: [PATCH] A few simplifications with the help of Intel tech support

[SVN r21997]
---
 include/boost/iterator/zip_iterator.hpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/include/boost/iterator/zip_iterator.hpp b/include/boost/iterator/zip_iterator.hpp
index aee58a2..d3f800c 100755
--- a/include/boost/iterator/zip_iterator.hpp
+++ b/include/boost/iterator/zip_iterator.hpp
@@ -32,10 +32,6 @@
 
 #include <boost/tuple/tuple.hpp>
 
-#if BOOST_WORKAROUND(__GNUC__, == 2) || BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-# include <boost/type_traits/remove_cv.hpp>
-#endif 
-
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/apply.hpp>
@@ -106,23 +102,13 @@ namespace boost {
       template<typename Iterator>
       struct apply
       { 
-#if BOOST_WORKAROUND(__EDG_VERSION__, != 0)     \
-    || BOOST_WORKAROUND(__GNUC__, == 2)         \
-    || BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
         typedef typename
-        iterator_traits<
-            typename boost::remove_cv<Iterator>::type
-        >::reference
+          iterator_traits<Iterator>::reference
         type;
-#else 
-        typedef typename
-        iterator_traits<Iterator>::reference
-        type;
-#endif
       };
 
       template<typename Iterator>
-        typename apply<Iterator>::type operator()(Iterator& it)
+        typename apply<Iterator>::type operator()(Iterator const& it)
       { return *it; }
     };