[Boost-commit] svn:boost r4409

From: jefffaust_at_[hidden]
Date: 2007-05-31 19:46:54

Author: jefffaust
Date: 2007-05-31 19:46:54 EDT (Thu, 31 May 2007)
New Revision: 4409
URL: http://svn.boost.org/trac/boost/changeset/4409

Log:
consider multimaps as associative containers

Text files modified: 
   sandbox/explore/boost/explore/is_assoc_iter.hpp |    17 ++++++++++-------                       
   1 files changed, 10 insertions(+), 7 deletions(-)

Modified: sandbox/explore/boost/explore/is_assoc_iter.hpp
==============================================================================
--- sandbox/explore/boost/explore/is_assoc_iter.hpp	(original)
+++ sandbox/explore/boost/explore/is_assoc_iter.hpp	2007-05-31 19:46:54 EDT (Thu, 31 May 2007)
@@ -15,6 +15,7 @@
 #include <map>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/or.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
@@ -63,13 +64,15 @@
 
         template< typename F, typename S, typename iterator_t>
         struct pair_matches_map< std::pair< F, S>, iterator_t> :
-            boost::is_same<
-                iterator_t,
-                typename std::map<
-                    typename boost::remove_const<F>::type,
-                    S
-                >::iterator
-            >
+            boost::mpl::or_<
+                boost::is_same<
+                    iterator_t,
+                    typename std::map<typename boost::remove_const<F>::type, S >::iterator
+                >,
+                boost::is_same<
+                    iterator_t,
+                    typename std::multimap<typename boost::remove_const<F>::type, S >::iterator
+                > >
         {};
 
         template <typename T>