diff options
author | merge-script <fanquake@gmail.com> | 2024-06-14 11:26:02 +0100 |
---|---|---|
committer | merge-script <fanquake@gmail.com> | 2024-06-14 11:26:02 +0100 |
commit | 0b94fb87206616e475566c3667cbaad0e9faa5b0 (patch) | |
tree | 6a03fac22e296fa63f9fc75e4efe126c290d5096 | |
parent | 54c5f67c38ea1195b9a5de11707fde2c4adfb0e4 (diff) | |
parent | 95812d912b6335caa7af2a084d84447fb4aad156 (diff) | |
download | bitcoin-0b94fb87206616e475566c3667cbaad0e9faa5b0.tar.xz |
Merge bitcoin/bitcoin#30281: Update leveldb subtree to latest upstream
a37778d4d32b4ddeff96f68a130dc8da3a84b278 Squashed 'src/leveldb/' changes from e2f10b4e47..688561cba8 (fanquake)
Pull request description:
Includes https://github.com/bitcoin-core/leveldb-subtree/pull/41 which is used in #30234.
ACKs for top commit:
theuni:
utACK 95812d912b6335caa7af2a084d84447fb4aad156
Tree-SHA512: 3d943695a3d33816cf5558b183f5629aa92a500a1544eecedf84952e93c8592a8cf0d554b88281fc0bad3c9e920ebcff1ed8edc12f8e73f36ed5335482beb829
-rw-r--r-- | src/leveldb/include/leveldb/status.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/leveldb/include/leveldb/status.h b/src/leveldb/include/leveldb/status.h index e3273144e4..68efe3001a 100644 --- a/src/leveldb/include/leveldb/status.h +++ b/src/leveldb/include/leveldb/status.h @@ -103,6 +103,8 @@ class LEVELDB_EXPORT Status { inline Status::Status(const Status& rhs) { state_ = (rhs.state_ == nullptr) ? nullptr : CopyState(rhs.state_); } + +// NOLINTBEGIN(bugprone-unhandled-self-assignment) inline Status& Status::operator=(const Status& rhs) { // The following condition catches both aliasing (when this == &rhs), // and the common case where both rhs and *this are ok. @@ -112,6 +114,8 @@ inline Status& Status::operator=(const Status& rhs) { } return *this; } +// NOLINTEND(bugprone-unhandled-self-assignment) + inline Status& Status::operator=(Status&& rhs) noexcept { std::swap(state_, rhs.state_); return *this; |