From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Sat, 2 Jan 2016 21:28:28 +0000 (+0100)
Subject: Fix deleted copy/assignment constructors
X-Git-Tag: dnsdist-1.0.0-alpha2~84^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=908e858229128345c5b99e59facd980a62eb1f5b;p=thirdparty%2Fpdns.git

Fix deleted copy/assignment constructors
---

diff --git a/pdns/sha.hh b/pdns/sha.hh
index 0751f0cd94..c9dfaeb603 100644
--- a/pdns/sha.hh
+++ b/pdns/sha.hh
@@ -20,16 +20,16 @@ public:
    SHA1Summer() { mbedtls_sha1_starts(&d_context); };
    void feed(const std::string &str) { feed(str.c_str(), str.length()); };
    void feed(const char *ptr, size_t len) { mbedtls_sha1_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const { 
+   const std::string get() const {
      mbedtls_sha1_context ctx2;
      unsigned char result[20] = {0};
      ctx2=d_context;
      mbedtls_sha1_finish(&ctx2, result);
      return std::string(result, result + sizeof result);
    };
+   SHA1Summer(const SHA1Summer&) = delete;
+   SHA1Summer& operator=(const SHA1Summer&) = delete;
 private:
-   SHA1Summer(const SHA1Summer&);
-   SHA1Summer& operator=(const SHA1Summer&);
    mbedtls_sha1_context d_context;
 };
 
@@ -46,9 +46,9 @@ public:
      mbedtls_sha256_finish(&ctx2, result);
      return std::string(result, result + 32);
    };
+   SHA256Summer(const SHA256Summer&) = delete;
+   SHA256Summer& operator=(const SHA256Summer&) = delete;
 private:
-   SHA256Summer(const SHA1Summer&);
-   SHA256Summer& operator=(const SHA1Summer&);
    mbedtls_sha256_context d_context;
 };
 
@@ -65,9 +65,9 @@ public:
      mbedtls_sha512_finish(&ctx2, result);
      return std::string(result, result + 48);
    };
+   SHA384Summer(const SHA384Summer&) = delete;
+   SHA384Summer& operator=(const SHA384Summer&) = delete;
 private:
-   SHA384Summer(const SHA1Summer&);
-   SHA384Summer& operator=(const SHA1Summer&);
    mbedtls_sha512_context d_context;
 };
 
@@ -84,9 +84,9 @@ public:
      mbedtls_sha512_finish(&ctx2, result);
      return std::string(result, result + sizeof result);
    };
+   SHA512Summer(const SHA512Summer&) = delete;
+   SHA512Summer& operator=(const SHA512Summer&) = delete;
 private:
-   SHA512Summer(const SHA1Summer&);
-   SHA512Summer& operator=(const SHA1Summer&);
    mbedtls_sha512_context d_context;
 };