feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

[boost][range] - Resolution of Trac item 4905 - Implementation of boost::range::map_keys should use boost::range_reference

Browse Source 
[SVN r67423]
This commit is contained in:
Neil Groves
2010-12-23 00:56:04 +00:00
parent de24df7962
commit 3adf4d2869
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/boost/range/adaptor/map.hpp
View File

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