From 394643b5608b20a4ca96f769234bd588f76720c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Fri, 24 Aug 2012 20:48:01 +0000
Subject: [PATCH] Ticket #7139

[SVN r80173]
---
 include/boost/container/flat_map.hpp | 12 ++----------
 include/boost/container/map.hpp      |  4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/include/boost/container/flat_map.hpp b/include/boost/container/flat_map.hpp
index 0142500..147c1fe 100644
--- a/include/boost/container/flat_map.hpp
+++ b/include/boost/container/flat_map.hpp
@@ -39,11 +39,7 @@ namespace container {
 
 /// @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 @@ static D force_copy(S s)
 //! 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 @@ struct has_trivial_destructor_after_move<boost::container::flat_map<K, T, C, A>
 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 @@ inline bool operator<(const flat_multimap<Key,T,Pred,A>& x,
 //! 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
diff --git a/include/boost/container/map.hpp b/include/boost/container/map.hpp
index 91cbd35..d4bd6e6 100644
--- a/include/boost/container/map.hpp
+++ b/include/boost/container/map.hpp
@@ -68,7 +68,7 @@ inline bool operator<(const map<Key,T,Pred,A>& x,
 //! 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 @@ namespace container {
 //! 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