From 84220855b2b3ef841a7e750967f0433c240e6770 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 26 Apr 2021 18:37:04 -0700
Subject: [PATCH] clang-tidy: use = delete

Found with modernize-use-equals-delete

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 samples/Jzon.h  | 10 ++++------
 src/basicio.cpp | 25 ++++++++++---------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/samples/Jzon.h b/samples/Jzon.h
index b2ec6ba3..e8ff8d6d 100644
--- a/samples/Jzon.h
+++ b/samples/Jzon.h
@@ -393,6 +393,8 @@ namespace Jzon
 		// Return result from last call to Write()
 		const std::string &GetResult() const;
 
+		// Disable assignment operator
+		Writer &operator=(const Writer&) = delete;
 	private:
 		void writeNode(const Node &node, unsigned int level);
 		void writeObject(const Object &node, unsigned int level);
@@ -404,9 +406,6 @@ namespace Jzon
 		class FormatInterpreter *fi;
 
 		const Node &root;
-
-		// Disable assignment operator
-		Writer &operator=(const Writer&);
 	};
 
 	class JzonAPI Parser
@@ -421,6 +420,8 @@ namespace Jzon
 
 		const std::string &GetError() const;
 
+		// Disable assignment operator
+		Parser &operator=(const Parser&) = delete;
 	private:
 		enum Token
 		{
@@ -455,9 +456,6 @@ namespace Jzon
 		Node &root;
 
 		std::string error;
-
-		// Disable assignment operator
-		Parser &operator=(const Parser&);
 	};
 }
 
diff --git a/src/basicio.cpp b/src/basicio.cpp
index fc31c926..d237342e 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -140,12 +140,9 @@ namespace Exiv2 {
         // Windows function to determine the number of hardlinks (on NTFS)
         DWORD winNumberOfLinks() const;
 #endif
-
-    private:
         // NOT IMPLEMENTED
-        Impl(const Impl& rhs);                         //!< Copy constructor
-        Impl& operator=(const Impl& rhs);              //!< Assignment
-
+        Impl(const Impl& rhs) = delete;             //!< Copy constructor
+        Impl& operator=(const Impl& rhs) = delete;  //!< Assignment
     }; // class FileIo::Impl
 
     FileIo::Impl::Impl(const std::string& path)
@@ -1063,11 +1060,9 @@ namespace Exiv2 {
         // METHODS
         void reserve(long wcount);         //!< Reserve memory
 
-    private:
         // NOT IMPLEMENTED
-        Impl(const Impl& rhs);             //!< Copy constructor
-        Impl& operator=(const Impl& rhs);  //!< Assignment
-
+        Impl(const Impl& rhs) = delete;             //!< Copy constructor
+        Impl& operator=(const Impl& rhs) = delete;  //!< Assignment
     }; // class MemIo::Impl
 
     MemIo::Impl::Impl()
@@ -2063,10 +2058,10 @@ namespace Exiv2 {
           @throw Error if it fails.
          */
         void writeRemote(const byte* data, size_t size, long from, long to);
-    protected:
+
         // NOT IMPLEMENTED
-        HttpImpl(const HttpImpl& rhs); //!< Copy constructor
-        HttpImpl& operator=(const HttpImpl& rhs); //!< Assignment
+        HttpImpl(const HttpImpl& rhs) = delete;             //!< Copy constructor
+        HttpImpl& operator=(const HttpImpl& rhs) = delete;  //!< Assignment
     }; // class HttpIo::HttpImpl
 
     HttpIo::HttpImpl::HttpImpl(const std::string& url, size_t blockSize):Impl(url, blockSize)
@@ -2233,10 +2228,10 @@ namespace Exiv2 {
                 http://dev.exiv2.org/wiki/exiv2
          */
         void writeRemote(const byte* data, size_t size, long from, long to);
-    protected:
+
         // NOT IMPLEMENTED
-        CurlImpl(const CurlImpl& rhs); //!< Copy constructor
-        CurlImpl& operator=(const CurlImpl& rhs); //!< Assignment
+        CurlImpl(const CurlImpl& rhs) = delete;             //!< Copy constructor
+        CurlImpl& operator=(const CurlImpl& rhs) = delete;  //!< Assignment
     private:
         long timeout_; //!< The number of seconds to wait while trying to connect.
     }; // class RemoteIo::Impl