From f3b179d451c92bce053fc67f514dff2931db378b 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] Remove pointless duplication of move constructor

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

diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp
index f40d03d4..a991950c 100644
--- a/include/boost/unordered/unordered_map.hpp
+++ b/include/boost/unordered/unordered_map.hpp
@@ -93,18 +93,13 @@ template <class K, class T, class H, class P, class A> class unordered_map
 
     unordered_map(unordered_map const&);
 
-#if defined(BOOST_UNORDERED_USE_MOVE)
+#if defined(BOOST_UNORDERED_USE_MOVE) ||                                       \
+    !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     unordered_map(BOOST_RV_REF(unordered_map) other)
         BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
         : table_(other.table_, boost::unordered::detail::move_tag())
     {
     }
-#elif !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    unordered_map(unordered_map&& other)
-        BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
-        : table_(other.table_, boost::unordered::detail::move_tag())
-    {
-    }
 #endif
 
     explicit unordered_map(allocator_type const&);
@@ -850,18 +845,13 @@ template <class K, class T, class H, class P, class A> class unordered_multimap
 
     unordered_multimap(unordered_multimap const&);
 
-#if defined(BOOST_UNORDERED_USE_MOVE)
+#if defined(BOOST_UNORDERED_USE_MOVE) ||                                       \
+    !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     unordered_multimap(BOOST_RV_REF(unordered_multimap) other)
         BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
         : table_(other.table_, boost::unordered::detail::move_tag())
     {
     }
-#elif !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    unordered_multimap(unordered_multimap&& other)
-        BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
-        : table_(other.table_, boost::unordered::detail::move_tag())
-    {
-    }
 #endif
 
     explicit unordered_multimap(allocator_type const&);
diff --git a/include/boost/unordered/unordered_set.hpp b/include/boost/unordered/unordered_set.hpp
index 6300d6d3..747f00f5 100644
--- a/include/boost/unordered/unordered_set.hpp
+++ b/include/boost/unordered/unordered_set.hpp
@@ -91,18 +91,13 @@ template <class T, class H, class P, class A> class unordered_set
 
     unordered_set(unordered_set const&);
 
-#if defined(BOOST_UNORDERED_USE_MOVE)
+#if defined(BOOST_UNORDERED_USE_MOVE) ||                                       \
+    !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     unordered_set(BOOST_RV_REF(unordered_set) other)
         BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
         : table_(other.table_, boost::unordered::detail::move_tag())
     {
     }
-#elif !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    unordered_set(unordered_set&& other)
-        BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
-        : table_(other.table_, boost::unordered::detail::move_tag())
-    {
-    }
 #endif
 
     explicit unordered_set(allocator_type const&);
@@ -576,18 +571,13 @@ template <class T, class H, class P, class A> class unordered_multiset
 
     unordered_multiset(unordered_multiset const&);
 
-#if defined(BOOST_UNORDERED_USE_MOVE)
+#if defined(BOOST_UNORDERED_USE_MOVE) ||                                       \
+    !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     unordered_multiset(BOOST_RV_REF(unordered_multiset) other)
         BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
         : table_(other.table_, boost::unordered::detail::move_tag())
     {
     }
-#elif !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    unordered_multiset(unordered_multiset&& other)
-        BOOST_NOEXCEPT_IF(table::nothrow_move_constructible)
-        : table_(other.table_, boost::unordered::detail::move_tag())
-    {
-    }
 #endif
 
     explicit unordered_multiset(allocator_type const&);