From fec5a6ede76e137710f79834da4e30501fc83938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 10 Mar 2019 15:53:39 -0400
Subject: [PATCH] make move operators noexcept
---
include/opendht/crypto.h | 4 ++--
include/opendht/sockaddr.h | 2 +-
src/op_cache.h | 4 ++--
src/value_cache.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/opendht/crypto.h b/include/opendht/crypto.h
index 175d4a76..13462eb1 100644
--- a/include/opendht/crypto.h
+++ b/include/opendht/crypto.h
@@ -186,7 +186,7 @@ class OPENDHT_PUBLIC RevocationList
public:
RevocationList();
RevocationList(const Blob& b);
- RevocationList(RevocationList&& o) : crl(o.crl) { o.crl = nullptr; }
+ RevocationList(RevocationList&& o) noexcept : crl(o.crl) { o.crl = nullptr; }
~RevocationList();
RevocationList& operator=(RevocationList&& o) { crl = o.crl; o.crl = nullptr; return *this; }
@@ -500,7 +500,7 @@ struct OPENDHT_PUBLIC TrustList
};
TrustList();
- TrustList(TrustList&& o) : trust(std::move(o.trust)) {
+ TrustList(TrustList&& o) noexcept : trust(std::move(o.trust)) {
o.trust = nullptr;
}
TrustList& operator=(TrustList&& o);
diff --git a/include/opendht/sockaddr.h b/include/opendht/sockaddr.h
index 995579e4..e9945479 100644
--- a/include/opendht/sockaddr.h
+++ b/include/opendht/sockaddr.h
@@ -58,7 +58,7 @@ public:
SockAddr(const SockAddr& o) {
set(o.get(), o.getLength());
}
- SockAddr(SockAddr&& o) : len(o.len), addr(std::move(o.addr)) {
+ SockAddr(SockAddr&& o) noexcept : len(o.len), addr(std::move(o.addr)) {
o.len = 0;
}
diff --git a/src/op_cache.h b/src/op_cache.h
index ec6b2d13..e1410209 100644
--- a/src/op_cache.h
+++ b/src/op_cache.h
@@ -32,8 +32,8 @@ struct OpCacheValueStorage
class OpValueCache {
public:
- OpValueCache(ValueCallback&& cb) : callback(std::forward<ValueCallback>(cb)) {}
- OpValueCache(OpValueCache&& o) : values(std::move(o.values)), callback(std::move(o.callback)) {
+ OpValueCache(ValueCallback&& cb) noexcept : callback(std::forward<ValueCallback>(cb)) {}
+ OpValueCache(OpValueCache&& o) noexcept : values(std::move(o.values)), callback(std::move(o.callback)) {
o.callback = {};
}
diff --git a/src/value_cache.h b/src/value_cache.h
index 74d6ea9a..aa3cf08d 100644
--- a/src/value_cache.h
+++ b/src/value_cache.h
@@ -34,7 +34,7 @@ public:
if (syncCallback)
syncCallback(ListenSyncStatus::ADDED);
}
- ValueCache(ValueCache&& o) : values(std::move(o.values)), callback(std::move(o.callback)), syncCallback(std::move(o.syncCallback)) {
+ ValueCache(ValueCache&& o) noexcept : values(std::move(o.values)), callback(std::move(o.callback)), syncCallback(std::move(o.syncCallback)) {
o.callback = {};
o.syncCallback = {};
}
--
GitLab