Merge pull request #4217 from lioncash/prototype

key_manager: Make use of canonical deleted operator=

1 files changed, 6 insertions, 3 deletions

diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h
index bf3434e1c..9269a73f2 100644
--- a/src/core/crypto/key_manager.h
+++ b/src/core/crypto/key_manager.h
@@ -223,13 +223,16 @@ bool operator<(const KeyIndex<KeyType>& lhs, const KeyIndex<KeyType>& rhs) {
 
 class KeyManager {
 public:
-    static KeyManager& instance() {
+    static KeyManager& Instance() {
         static KeyManager instance;
         return instance;
     }
 
-    KeyManager(KeyManager const&) = delete;
-    void operator=(KeyManager const&) = delete;
+    KeyManager(const KeyManager&) = delete;
+    KeyManager& operator=(const KeyManager&) = delete;
+
+    KeyManager(KeyManager&&) = delete;
+    KeyManager& operator=(KeyManager&&) = delete;
 
     bool HasKey(S128KeyType id, u64 field1 = 0, u64 field2 = 0) const;
     bool HasKey(S256KeyType id, u64 field1 = 0, u64 field2 = 0) const;