Index: boost/range/adaptor/map.hpp
===================================================================
--- boost/range/adaptor/map.hpp	(revision 66808)
+++ boost/range/adaptor/map.hpp	(working copy)
@@ -14,6 +14,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/value_type.hpp>
+#include <boost/range/reference.hpp>
 
 namespace boost
 {
@@ -25,11 +26,11 @@
         template< class Map >
         struct select_first
         {
-            typedef BOOST_DEDUCED_TYPENAME range_value<Map>::type pair_t;
-            typedef const BOOST_DEDUCED_TYPENAME pair_t::first_type&
+            typedef BOOST_DEDUCED_TYPENAME range_reference<const Map>::type reference;
+            typedef const BOOST_DEDUCED_TYPENAME range_value<Map>::type::first_type&
                 result_type;
 
-            result_type operator()( const pair_t& r ) const
+            result_type operator()( reference r ) const
             {
                 return r.first;
             }
@@ -38,10 +39,11 @@
         template< class Map >
         struct select_second_mutable
         {
-            typedef BOOST_DEDUCED_TYPENAME range_value<Map>::type pair_t;
-            typedef BOOST_DEDUCED_TYPENAME pair_t::second_type& result_type;
+            typedef BOOST_DEDUCED_TYPENAME range_reference<Map>::type reference;
+            typedef BOOST_DEDUCED_TYPENAME range_value<Map>::type::second_type& 
+                result_type;
 
-            result_type operator()( pair_t& r ) const
+            result_type operator()( reference r ) const
             {
                 return r.second;
             }
@@ -50,11 +52,11 @@
         template< class Map >
         struct select_second_const
         {
-            typedef BOOST_DEDUCED_TYPENAME range_value<Map>::type pair_t;
-            typedef const BOOST_DEDUCED_TYPENAME pair_t::second_type&
+            typedef BOOST_DEDUCED_TYPENAME range_reference<const Map>::type reference;
+            typedef const BOOST_DEDUCED_TYPENAME range_value<Map>::type::second_type&
                 result_type;
 
-            result_type operator()( const pair_t& r ) const
+            result_type operator()( reference r ) const
             {
                 return r.second;
             }