From 15c143f9bd81aab6d29cfc208afa197269926876 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 4 Dec 2023 16:45:29 -0800
Subject: [PATCH] clang-tidy: use delete

Found with modernize-use-equals-delete

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 modules/bindbackend/bindbackend2.hh | 6 +++---
 modules/ldapbackend/powerldap.hh    | 6 +++---
 pdns/dynmessenger.hh                | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/bindbackend/bindbackend2.hh b/modules/bindbackend/bindbackend2.hh
index 14aff4835c6d..2e88b8f696da 100644
--- a/modules/bindbackend/bindbackend2.hh
+++ b/modules/bindbackend/bindbackend2.hh
@@ -258,6 +258,9 @@ private:
 
     handle();
 
+    handle(const handle&) = delete;
+    handle& operator=(const handle&) = delete; // don't go copying this
+
     shared_ptr<const recordstorage_t> d_records;
     recordstorage_t::index<UnorderedNameTag>::type::const_iterator d_iter, d_end_iter;
 
@@ -274,9 +277,6 @@ private:
   private:
     bool get_normal(DNSResourceRecord&);
     bool get_list(DNSResourceRecord&);
-
-    void operator=(const handle&); // don't go copying this
-    handle(const handle&);
   };
 
   unique_ptr<SSqlStatement> d_getAllDomainMetadataQuery_stmt;
diff --git a/modules/ldapbackend/powerldap.hh b/modules/ldapbackend/powerldap.hh
index 6b9fa2056d19..e8b030d78fb5 100644
--- a/modules/ldapbackend/powerldap.hh
+++ b/modules/ldapbackend/powerldap.hh
@@ -62,12 +62,12 @@ public:
     int d_msgid;
     bool d_finished;
 
-    SearchResult(const SearchResult& other);
-    SearchResult& operator=(const SearchResult& other);
-
   public:
     typedef std::unique_ptr<SearchResult> Ptr;
 
+    SearchResult(const SearchResult& other) = delete;
+    SearchResult& operator=(const SearchResult& other) = delete;
+
     SearchResult(int msgid, LDAP* ld);
     ~SearchResult();
 
diff --git a/pdns/dynmessenger.hh b/pdns/dynmessenger.hh
index 57adee3f331d..778c45f563bf 100644
--- a/pdns/dynmessenger.hh
+++ b/pdns/dynmessenger.hh
@@ -40,8 +40,6 @@ class DynMessenger
 
   struct sockaddr_un d_remote; // our remote address
 
-  DynMessenger(const DynMessenger &); // NOT IMPLEMENTED
-  
 public:
   // CREATORS
 
@@ -54,6 +52,9 @@ public:
     int timeout_sec = 7,
     int timeout_usec = 0);  //!< Create a DynMessenger sending to this file
 
+  DynMessenger(const DynMessenger&) = delete; // NOT IMPLEMENTED
+  DynMessenger& operator=(const DynMessenger&) = delete; // NOT IMPLEMENTED
+
   ~DynMessenger();
 
   // ACCESSORS