Update of /cvsroot/boost/boost/boost/bimap/detail In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1017/detail
Modified Files:
map_view_base.hpp
Log Message:
fix const_reference, add range_type
Index: map_view_base.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/bimap/detail/map_view_base.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- map_view_base.hpp 25 May 2007 01:07:06 -0000 1.1
+++ map_view_base.hpp 26 May 2007 02:49:07 -0000 1.2
@@ -417,10 +417,17 @@
/*===========================================================================*/
#define BOOST_BIMAP_MAP_VIEW_RANGE_IMPLEMENTATION(BASE) \
\
+typedef std::pair< \
+ BOOST_DEDUCED_TYPENAME base_::iterator, \
+ BOOST_DEDUCED_TYPENAME base_::iterator> range_type; \
+ \
+typedef std::pair< \
+ BOOST_DEDUCED_TYPENAME base_::const_iterator, \
+ BOOST_DEDUCED_TYPENAME base_::const_iterator> const_range_type; \
+ \
+ \
template< class LowerBounder, class UpperBounder> \
-std::pair<BOOST_DEDUCED_TYPENAME BASE::iterator, \
- BOOST_DEDUCED_TYPENAME BASE::iterator> \
- range(LowerBounder lower,UpperBounder upper) \
+range_type range(LowerBounder lower,UpperBounder upper) \
{ \
std::pair< \
\
@@ -429,11 +436,7 @@
\
> r( this->base().range(lower,upper) ); \
\
- return std::pair \
- < \
- BOOST_DEDUCED_TYPENAME BASE::iterator, \
- BOOST_DEDUCED_TYPENAME BASE::iterator \
- >( \
+ return range_type( \
this->template functor< \
BOOST_DEDUCED_TYPENAME BASE::iterator_from_base \
>() ( r.first ), \
@@ -444,9 +447,7 @@
} \
\
template< class LowerBounder, class UpperBounder> \
-std::pair<BOOST_DEDUCED_TYPENAME BASE::const_iterator, \
- BOOST_DEDUCED_TYPENAME BASE::const_iterator> \
- range(LowerBounder lower,UpperBounder upper) const \
+const_range_type range(LowerBounder lower,UpperBounder upper) const \
{ \
std::pair< \
\
@@ -455,11 +456,7 @@
\
> r( this->base().range(lower,upper) ); \
\
- return std::pair \
- < \
- BOOST_DEDUCED_TYPENAME BASE::const_iterator, \
- BOOST_DEDUCED_TYPENAME BASE::const_iterator \
- >( \
+ return const_range_type( \
this->template functor< \
BOOST_DEDUCED_TYPENAME BASE::iterator_from_base \
>() ( r.first ), \
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
