dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpp-btree' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-09-29 12:06:18 +01:00
parent ca4db69f12 9176d9a284
commit 02bd91477d
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/3rdparty/cpp-btree/btree_map.h vendored
View File

@@ -64,13 +64,13 @@ class btree_map : public btree_map_container<
} }
// Move constructor. // Move constructor.
btree_map(self_type &&x) btree_map(self_type &&x) noexcept
: super_type() { : super_type() {
this->swap(x); this->swap(x);
} }
// Copy/move assignment // Copy/move assignment
self_type& operator=(self_type x) { self_type& operator=(self_type x) noexcept {
this->swap(x); this->swap(x);
return *this; return *this;
} }
@@ -123,13 +123,13 @@ class btree_multimap : public btree_multi_container<
} }
// Move constructor. // Move constructor.
btree_multimap(self_type &&x) btree_multimap(self_type &&x) noexcept
: super_type() { : super_type() {
this->swap(x); this->swap(x);
} }
// Copy/move assignment // Copy/move assignment
self_type& operator=(self_type x) { self_type& operator=(self_type x) noexcept {
this->swap(x); this->swap(x);
return *this; return *this;
} }

8
src/3rdparty/cpp-btree/btree_set.h vendored
View File

@@ -59,13 +59,13 @@ class btree_set : public btree_unique_container<
} }
// Move constructor. // Move constructor.
btree_set(self_type &&x) btree_set(self_type &&x) noexcept
: super_type() { : super_type() {
this->swap(x); this->swap(x);
} }
// Copy/move assignment // Copy/move assignment
self_type& operator=(self_type x) { self_type& operator=(self_type x) noexcept {
this->swap(x); this->swap(x);
return *this; return *this;
} }
@@ -114,13 +114,13 @@ class btree_multiset : public btree_multi_container<
} }
// Move constructor. // Move constructor.
btree_multiset(self_type &&x) btree_multiset(self_type &&x) noexcept
: super_type() { : super_type() {
this->swap(x); this->swap(x);
} }
// Copy/move assignment // Copy/move assignment
self_type& operator=(self_type x) { self_type& operator=(self_type x) noexcept {
this->swap(x); this->swap(x);
return *this; return *this;
} }

4
src/3rdparty/cpp-btree/safe_btree_map.h vendored
View File

@@ -70,13 +70,13 @@ class safe_btree_map : public btree_map_container<
} }
// Move constructor. // Move constructor.
safe_btree_map(self_type &&x) safe_btree_map(self_type &&x) noexcept
: super_type() { : super_type() {
this->swap(x); this->swap(x);
} }
// Copy/move assignment // Copy/move assignment
self_type& operator=(self_type x) { self_type& operator=(self_type x) noexcept {
this->swap(x); this->swap(x);
return *this; return *this;
} }

4
src/3rdparty/cpp-btree/safe_btree_set.h vendored
View File

@@ -69,13 +69,13 @@ class safe_btree_set : public btree_unique_container<
} }
// Move constructor. // Move constructor.
safe_btree_set(self_type &&x) safe_btree_set(self_type &&x) noexcept
: super_type() { : super_type() {
this->swap(x); this->swap(x);
} }
// Copy/move assignment // Copy/move assignment
self_type& operator=(self_type x) { self_type& operator=(self_type x) noexcept {
this->swap(x); this->swap(x);
return *this; return *this;
} }