[Boost-commit] svn:boost r80173 - trunk/boost/container

Subject: [Boost-commit] svn:boost r80173 - trunk/boost/container
From: igaztanaga_at_[hidden]
Date: 2012-08-24 16:48:02

Author: igaztanaga
Date: 2012-08-24 16:48:01 EDT (Fri, 24 Aug 2012)
New Revision: 80173
URL: http://svn.boost.org/trac/boost/changeset/80173

Log:
Ticket #7139
Text files modified: 
   trunk/boost/container/flat_map.hpp |    12 ++----------                            
   trunk/boost/container/map.hpp      |     4 ++--                                    
   2 files changed, 4 insertions(+), 12 deletions(-)

Modified: trunk/boost/container/flat_map.hpp
==============================================================================
--- trunk/boost/container/flat_map.hpp	(original)
+++ trunk/boost/container/flat_map.hpp	2012-08-24 16:48:01 EDT (Fri, 24 Aug 2012)
@@ -39,11 +39,7 @@
 
 /// @cond
 // Forward declarations of operators == and <, needed for friend declarations.
-#ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class Key, class T, class Pred = std::less< std::pair< Key, T> >, class A = std::allocator<T> >
-#else
 template <class Key, class T, class Pred, class A>
-#endif
 class flat_map;
 
 template <class Key, class T, class Pred, class A>
@@ -94,7 +90,7 @@
 //! Erasing an element of a flat_map invalidates iterators and references
 //! pointing to elements that come after (their keys are bigger) the erased element.
 #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class Key, class T, class Pred = std::less< std::pair< Key, T> >, class A = std::allocator<T> >
+template <class Key, class T, class Pred = std::less<Key>, class A = std::allocator< std::pair< Key, T> > >
 #else
 template <class Key, class T, class Pred, class A>
 #endif
@@ -870,11 +866,7 @@
 namespace container {
 
 // Forward declaration of operators < and ==, needed for friend declaration.
-#ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class Key, class T, class Pred = std::less< std::pair< Key, T> >, class A = std::allocator<T> >
-#else
 template <class Key, class T, class Pred, class A>
-#endif
 class flat_multimap;
 
 template <class Key, class T, class Pred, class A>
@@ -901,7 +893,7 @@
 //! A is the allocator to allocate the value_types
 //! (e.g. <i>allocator< std::pair<Key, T> ></i>).
 #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class Key, class T, class Pred = std::less< std::pair< Key, T> >, class A = std::allocator<T> >
+template <class Key, class T, class Pred = std::less<Key>, class A = std::allocator< std::pair< Key, T> > >
 #else
 template <class Key, class T, class Pred, class A>
 #endif

Modified: trunk/boost/container/map.hpp
==============================================================================
--- trunk/boost/container/map.hpp	(original)
+++ trunk/boost/container/map.hpp	2012-08-24 16:48:01 EDT (Fri, 24 Aug 2012)
@@ -68,7 +68,7 @@
 //! A is the allocator to allocate the value_types
 //! (e.g. <i>allocator< std::pair<const Key, T> > </i>).
 #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class Key, class T, class Pred = std::less< std::pair< const Key, T> >, class A = std::allocator<T> >
+template <class Key, class T, class Pred = std::less<Key>, class A = std::allocator< std::pair< const Key, T> > >
 #else
 template <class Key, class T, class Pred, class A>
 #endif
@@ -814,7 +814,7 @@
 //! A is the allocator to allocate the value_types
 //!(e.g. <i>allocator< std::pair<<b>const</b> Key, T> ></i>).
 #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class Key, class T, class Pred = std::less< std::pair< const Key, T> >, class A = std::allocator<T> >
+template <class Key, class T, class Pred = std::less<Key>, class A = std::allocator< std::pair< const Key, T> > >
 #else
 template <class Key, class T, class Pred, class A>
 #endif