Index: iterator_range_core.hpp
===================================================================
--- iterator_range_core.hpp	(revision 61263)
+++ iterator_range_core.hpp	(working copy)
@@ -23,6 +23,8 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/type_traits/is_abstract.hpp>
 #include <boost/type_traits/is_pointer.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/mpl/eval_if.hpp>
 #include <boost/range/functions.hpp>
 #include <boost/range/iterator.hpp>
 #include <boost/range/difference_type.hpp>
@@ -151,6 +153,15 @@
                 boost::mpl::if_< boost::is_abstract<value_type>,
                                  reference, value_type >::type abstract_value_type;
 
+            // for the return value of operator[]
+            typedef BOOST_DEDUCED_TYPENAME
+                boost::mpl::eval_if<
+                    boost::is_pointer<iterator>,
+                    boost::mpl::identity<reference>,
+                    boost::detail::operator_brackets_result<iterator, value_type, reference>
+                >::type
+            abstract_reference_type;
+
         public:
             iterator_range() : m_Begin( iterator() ), m_End( iterator() )
             { }
@@ -304,15 +315,10 @@
             // pointers as iterators. Since a pointer can't have the
             // issues with proxies this implementation uses a simpler
             // implementation if the iterator is a pointer.
-            BOOST_DEDUCED_TYPENAME boost::mpl::if_<
-                boost::is_pointer<iterator>,
-                reference,
-                BOOST_DEDUCED_TYPENAME boost::detail::operator_brackets_result<iterator, value_type, reference>::type
-            >::type
-            operator[]( difference_type at ) const
+            abstract_reference_type operator[]( difference_type at ) const
             {
                 BOOST_ASSERT( at >= 0 && at < size() );
-                return get_at(m_Begin, at);
+                return get_at(m_Begin, at, boost::is_pointer<iterator>());
             }
 #endif
 
@@ -340,22 +346,17 @@
            }
 
         private:
+           
             template<class Iterator>
-            static BOOST_DEDUCED_TYPENAME boost::enable_if<
-                boost::is_pointer<Iterator>,
-                reference
-                >::type
-            get_at( Iterator it, difference_type at )
+            static abstract_reference_type
+            get_at( Iterator it, difference_type at, boost::mpl::true_ )
             {
                 return it[at];
             }
 
             template<class Iterator>
-            static BOOST_DEDUCED_TYPENAME boost::disable_if<
-                boost::is_pointer<Iterator>,
-                BOOST_DEDUCED_TYPENAME boost::detail::operator_brackets_result<Iterator, value_type, reference>::type
-                >::type
-            get_at( Iterator it, difference_type at )
+            static abstract_reference_type
+            get_at( Iterator it, difference_type at, boost::mpl::false_ )
             {
                typedef boost::detail::use_operator_brackets_proxy<value_type,reference> use_proxy;
                return boost::detail::make_operator_brackets_result<Iterator>(it + at, use_proxy());