From 1a18cd2196d8d0bcb2433cdabdef03168bd5a7af Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 20 Apr 2017 22:59:00 +0100
Subject: [PATCH] Move capacity functions to match order in standard

---
 include/boost/unordered/unordered_map.hpp | 32 +++++++++++------------
 include/boost/unordered/unordered_set.hpp | 32 +++++++++++------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp
index 8b5fffe2..41419b9d 100644
--- a/include/boost/unordered/unordered_map.hpp
+++ b/include/boost/unordered/unordered_map.hpp
@@ -190,14 +190,6 @@ template <class K, class T, class H, class P, class A> class unordered_map
         return table_.node_alloc();
     }
 
-    // size and capacity
-
-    bool empty() const BOOST_NOEXCEPT { return table_.size_ == 0; }
-
-    size_type size() const BOOST_NOEXCEPT { return table_.size_; }
-
-    size_type max_size() const BOOST_NOEXCEPT;
-
     // iterators
 
     iterator begin() BOOST_NOEXCEPT { return iterator(table_.begin()); }
@@ -218,6 +210,14 @@ template <class K, class T, class H, class P, class A> class unordered_map
 
     const_iterator cend() const BOOST_NOEXCEPT { return const_iterator(); }
 
+    // size and capacity
+
+    bool empty() const BOOST_NOEXCEPT { return table_.size_ == 0; }
+
+    size_type size() const BOOST_NOEXCEPT { return table_.size_; }
+
+    size_type max_size() const BOOST_NOEXCEPT;
+
     // extract
 
     node_type extract(const_iterator position)
@@ -913,14 +913,6 @@ template <class K, class T, class H, class P, class A> class unordered_multimap
         return table_.node_alloc();
     }
 
-    // size and capacity
-
-    bool empty() const BOOST_NOEXCEPT { return table_.size_ == 0; }
-
-    size_type size() const BOOST_NOEXCEPT { return table_.size_; }
-
-    size_type max_size() const BOOST_NOEXCEPT;
-
     // iterators
 
     iterator begin() BOOST_NOEXCEPT { return iterator(table_.begin()); }
@@ -941,6 +933,14 @@ template <class K, class T, class H, class P, class A> class unordered_multimap
 
     const_iterator cend() const BOOST_NOEXCEPT { return const_iterator(); }
 
+    // size and capacity
+
+    bool empty() const BOOST_NOEXCEPT { return table_.size_ == 0; }
+
+    size_type size() const BOOST_NOEXCEPT { return table_.size_; }
+
+    size_type max_size() const BOOST_NOEXCEPT;
+
     // extract
 
     node_type extract(const_iterator position)
diff --git a/include/boost/unordered/unordered_set.hpp b/include/boost/unordered/unordered_set.hpp
index 52136bc6..0bc240c1 100644
--- a/include/boost/unordered/unordered_set.hpp
+++ b/include/boost/unordered/unordered_set.hpp
@@ -188,14 +188,6 @@ template <class T, class H, class P, class A> class unordered_set
         return table_.node_alloc();
     }
 
-    // size and capacity
-
-    bool empty() const BOOST_NOEXCEPT { return table_.size_ == 0; }
-
-    size_type size() const BOOST_NOEXCEPT { return table_.size_; }
-
-    size_type max_size() const BOOST_NOEXCEPT;
-
     // iterators
 
     iterator begin() BOOST_NOEXCEPT { return iterator(table_.begin()); }
@@ -216,6 +208,14 @@ template <class T, class H, class P, class A> class unordered_set
 
     const_iterator cend() const BOOST_NOEXCEPT { return const_iterator(); }
 
+    // size and capacity
+
+    bool empty() const BOOST_NOEXCEPT { return table_.size_ == 0; }
+
+    size_type size() const BOOST_NOEXCEPT { return table_.size_; }
+
+    size_type max_size() const BOOST_NOEXCEPT;
+
     // extract
 
     node_type extract(const_iterator position)
@@ -654,14 +654,6 @@ template <class T, class H, class P, class A> class unordered_multiset
         return table_.node_alloc();
     }
 
-    // size and capacity
-
-    bool empty() const BOOST_NOEXCEPT { return table_.size_ == 0; }
-
-    size_type size() const BOOST_NOEXCEPT { return table_.size_; }
-
-    size_type max_size() const BOOST_NOEXCEPT;
-
     // iterators
 
     iterator begin() BOOST_NOEXCEPT { return iterator(table_.begin()); }
@@ -682,6 +674,14 @@ template <class T, class H, class P, class A> class unordered_multiset
 
     const_iterator cend() const BOOST_NOEXCEPT { return const_iterator(); }
 
+    // size and capacity
+
+    bool empty() const BOOST_NOEXCEPT { return table_.size_ == 0; }
+
+    size_type size() const BOOST_NOEXCEPT { return table_.size_; }
+
+    size_type max_size() const BOOST_NOEXCEPT;
+
     // extract
 
     node_type extract(const_iterator position)