From 9176d9a284a9346c602458efc9713ef516eef76b Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Sun, 29 Sep 2019 12:03:12 +0100
Subject: [PATCH] cpp-btree: Update to match upstream

Add noexcept to swap-based move constructors and copy/move assignment operator
---
 src/3rdparty/cpp-btree/btree_map.h      | 8 ++++----
 src/3rdparty/cpp-btree/btree_set.h      | 8 ++++----
 src/3rdparty/cpp-btree/safe_btree_map.h | 4 ++--
 src/3rdparty/cpp-btree/safe_btree_set.h | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/3rdparty/cpp-btree/btree_map.h b/src/3rdparty/cpp-btree/btree_map.h
index bd5e809626..948827dec5 100644
--- a/src/3rdparty/cpp-btree/btree_map.h
+++ b/src/3rdparty/cpp-btree/btree_map.h
@@ -64,13 +64,13 @@ class btree_map : public btree_map_container<
   }
 
   // Move constructor.
-  btree_map(self_type &&x)
+  btree_map(self_type &&x) noexcept
       : super_type() {
     this->swap(x);
   }
 
   // Copy/move assignment
-  self_type& operator=(self_type x) {
+  self_type& operator=(self_type x) noexcept {
     this->swap(x);
     return *this;
   }
@@ -123,13 +123,13 @@ class btree_multimap : public btree_multi_container<
   }
 
   // Move constructor.
-  btree_multimap(self_type &&x)
+  btree_multimap(self_type &&x) noexcept
       : super_type() {
     this->swap(x);
   }
 
   // Copy/move assignment
-  self_type& operator=(self_type x) {
+  self_type& operator=(self_type x) noexcept {
     this->swap(x);
     return *this;
   }
diff --git a/src/3rdparty/cpp-btree/btree_set.h b/src/3rdparty/cpp-btree/btree_set.h
index a4382fcb5c..4c60bc0887 100644
--- a/src/3rdparty/cpp-btree/btree_set.h
+++ b/src/3rdparty/cpp-btree/btree_set.h
@@ -59,13 +59,13 @@ class btree_set : public btree_unique_container<
   }
 
   // Move constructor.
-  btree_set(self_type &&x)
+  btree_set(self_type &&x) noexcept
       : super_type() {
     this->swap(x);
   }
 
   // Copy/move assignment
-  self_type& operator=(self_type x) {
+  self_type& operator=(self_type x) noexcept {
     this->swap(x);
     return *this;
   }
@@ -114,13 +114,13 @@ class btree_multiset : public btree_multi_container<
   }
 
   // Move constructor.
-  btree_multiset(self_type &&x)
+  btree_multiset(self_type &&x) noexcept
       : super_type() {
     this->swap(x);
   }
 
   // Copy/move assignment
-  self_type& operator=(self_type x) {
+  self_type& operator=(self_type x) noexcept {
     this->swap(x);
     return *this;
   }
diff --git a/src/3rdparty/cpp-btree/safe_btree_map.h b/src/3rdparty/cpp-btree/safe_btree_map.h
index b9abaa1c62..692228b540 100644
--- a/src/3rdparty/cpp-btree/safe_btree_map.h
+++ b/src/3rdparty/cpp-btree/safe_btree_map.h
@@ -70,13 +70,13 @@ class safe_btree_map : public btree_map_container<
   }
 
   // Move constructor.
-  safe_btree_map(self_type &&x)
+  safe_btree_map(self_type &&x) noexcept
       : super_type() {
     this->swap(x);
   }
 
   // Copy/move assignment
-  self_type& operator=(self_type x) {
+  self_type& operator=(self_type x) noexcept {
     this->swap(x);
     return *this;
   }
diff --git a/src/3rdparty/cpp-btree/safe_btree_set.h b/src/3rdparty/cpp-btree/safe_btree_set.h
index 722cfa85bb..9e38959033 100644
--- a/src/3rdparty/cpp-btree/safe_btree_set.h
+++ b/src/3rdparty/cpp-btree/safe_btree_set.h
@@ -69,13 +69,13 @@ class safe_btree_set : public btree_unique_container<
   }
 
   // Move constructor.
-  safe_btree_set(self_type &&x)
+  safe_btree_set(self_type &&x) noexcept
       : super_type() {
     this->swap(x);
   }
 
   // Copy/move assignment
-  self_type& operator=(self_type x) {
+  self_type& operator=(self_type x) noexcept {
     this->swap(x);
     return *this;
   }