con/destructor fixes

Added = delete to make it explicit. Also made them public.

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

include/exiv2/basicio.hpp

@@ -243,16 +243,9 @@ namespace Exiv2 {
         /*!
           @brief this is allocated and populated by mmap()
          */
-        byte* bigBlock_;
+        byte* bigBlock_{};
 
         //@}
-
-    protected:
-        //! @name Creators
-        //@{
-        //! Default Constructor
-        BasicIo() : bigBlock_(NULL) {};
-        //@}
     }; // class BasicIo
 
     /*!
@@ -281,12 +274,11 @@ namespace Exiv2 {
         //! The BasicIo reference
         BasicIo& bio_;
 
-    private:
         // Not implemented
         //! Copy constructor
-        IoCloser(const IoCloser&);
+        IoCloser(const IoCloser&) = delete;
         //! Assignment operator
-        IoCloser& operator=(const IoCloser&);
+        IoCloser& operator=(const IoCloser&) = delete;
     }; // class IoCloser
 
     /*!
@@ -512,13 +504,13 @@ namespace Exiv2 {
         virtual void populateFakeData();
         //@}
 
-    private:
         // NOT IMPLEMENTED
         //! Copy constructor
-        FileIo(FileIo& rhs);
+        FileIo(FileIo& rhs) = delete;
         //! Assignment operator
-        FileIo& operator=(const FileIo& rhs);
+        FileIo& operator=(const FileIo& rhs) = delete;
 
+    private:
         // Pimpl idiom
         class Impl;
         std::unique_ptr<Impl> p_;
@@ -712,13 +704,13 @@ namespace Exiv2 {
 
         //@}
 
-    private:
         // NOT IMPLEMENTED
         //! Copy constructor
-        MemIo(MemIo& rhs);
+        MemIo(MemIo& rhs) = delete;
         //! Assignment operator
-        MemIo& operator=(const MemIo& rhs);
+        MemIo& operator=(const MemIo& rhs) = delete;
 
+    private:
         // Pimpl idiom
         class Impl;
         std::unique_ptr<Impl> p_;
@@ -1029,13 +1021,13 @@ namespace Exiv2 {
          */
         HttpIo(const std::wstring& wurl, size_t blockSize = 1024);
 #endif
-        //@}
-    protected:
         // NOT IMPLEMENTED
         //! Copy constructor
-        HttpIo(HttpIo& rhs);
+        HttpIo(HttpIo& rhs) = delete;
         //! Assignment operator
-        HttpIo& operator=(const HttpIo& rhs);
+        HttpIo& operator=(const HttpIo& rhs) = delete;
+
+    private:
         // Pimpl idiom
         class HttpImpl;
     };
@@ -1079,12 +1071,14 @@ namespace Exiv2 {
                 for the protocol. Otherwise, it throws the Error.
          */
         long write(BasicIo& src);
-    protected:
+
         // NOT IMPLEMENTED
         //! Copy constructor
-        CurlIo(CurlIo& rhs);
+        CurlIo(CurlIo& rhs) = delete;
         //! Assignment operator
-        CurlIo& operator=(const CurlIo& rhs);
+        CurlIo& operator=(const CurlIo& rhs) = delete;
+
+    protected:
         // Pimpl idiom
         class CurlImpl;
     };

include/exiv2/bmpimage.hpp

@@ -50,15 +50,15 @@ namespace Exiv2 {
           read width and height.
      */
     class EXIV2API BmpImage : public Image {
+    public:
         //! @name NOT Implemented
         //@{
         //! Copy constructor
-        BmpImage(const BmpImage& rhs);
+        BmpImage(const BmpImage& rhs) = delete;
         //! Assignment operator
-        BmpImage& operator=(const BmpImage& rhs);
+        BmpImage& operator=(const BmpImage& rhs) = delete;
         //@}
 
-    public:
         //! @name Creators
         //@{
         /*!

include/exiv2/cr2image.hpp

@@ -96,13 +96,12 @@ namespace Exiv2 {
         int pixelHeight() const;
         //@}
 
-    private:
         //! @name NOT implemented
         //@{
         //! Copy constructor
-        Cr2Image(const Cr2Image& rhs);
+        Cr2Image(const Cr2Image& rhs) = delete;
         //! Assignment operator
-        Cr2Image& operator=(const Cr2Image& rhs);
+        Cr2Image& operator=(const Cr2Image& rhs) = delete;
         //@}
 
     }; // class Cr2Image

include/exiv2/crwimage.hpp

@@ -96,13 +96,12 @@ namespace Exiv2 {
         int pixelHeight() const;
         //@}
 
-    private:
         //! @name NOT Implemented
         //@{
         //! Copy constructor
-        CrwImage(const CrwImage& rhs);
+        CrwImage(const CrwImage& rhs) = delete;
         //! Assignment operator
-        CrwImage& operator=(const CrwImage& rhs);
+        CrwImage& operator=(const CrwImage& rhs) = delete;
         //@}
 
     }; // class CrwImage

include/exiv2/datasets.hpp

@@ -156,15 +156,13 @@ namespace Exiv2 {
         static constexpr uint16_t Preview                = 202;
         //@}
 
-    private:
         //! Prevent construction: not implemented.
-        IptcDataSets() {}
+        IptcDataSets() = delete;
         //! Prevent copy-construction: not implemented.
-        IptcDataSets(const IptcDataSets& rhs);
+        IptcDataSets(const IptcDataSets& rhs) = delete;
         //! Prevent assignment: not implemented.
-        IptcDataSets& operator=(const IptcDataSets& rhs);
+        IptcDataSets& operator=(const IptcDataSets& rhs) = delete;
 
-    public:
         /*!
           @brief Return the name of the dataset.
           @param number The dataset number

include/exiv2/epsimage.hpp

@@ -93,13 +93,12 @@ namespace Exiv2
         std::string mimeType() const;
         //@}
 
-    private:
         //! @name NOT Implemented
         //@{
         //! Copy constructor
-        EpsImage(const EpsImage& rhs);
+        EpsImage(const EpsImage& rhs) = delete;
         //! Assignment operator
-        EpsImage& operator=(const EpsImage& rhs);
+        EpsImage& operator=(const EpsImage& rhs) = delete;
         //@}
 
     }; // class EpsImage

include/exiv2/error.hpp

@@ -73,11 +73,11 @@ namespace Exiv2 {
              make that call any logic that always needs to be executed.
      */
     class EXIV2API LogMsg {
+    public:
         //! Prevent copy-construction: not implemented.
-        LogMsg(const LogMsg&);
+        LogMsg(const LogMsg&) = delete;
         //! Prevent assignment: not implemented.
-        LogMsg& operator=(const LogMsg&);
-    public:
+        LogMsg& operator=(const LogMsg&) = delete;
         /*!
           @brief Defined log levels. To suppress all log messages, either set the
                  log level to \c mute or set the log message handler to 0.

include/exiv2/gifimage.hpp

@@ -43,15 +43,15 @@ namespace Exiv2 {
              directly.
      */
     class EXIV2API GifImage : public Image {
+    public:
         //! @name NOT Implemented
         //@{
         //! Copy constructor
-        GifImage(const GifImage& rhs);
+        GifImage(const GifImage& rhs) = delete;
         //! Assignment operator
-        GifImage& operator=(const GifImage& rhs);
+        GifImage& operator=(const GifImage& rhs) = delete;
         //@}
 
-    public:
         //! @name Creators
         //@{
         /*!

include/exiv2/image.hpp

@@ -482,6 +482,14 @@ namespace Exiv2 {
         //! set type support for this image format
         int imageType() const { return imageType_; }
 
+        //! @name NOT implemented
+        //@{
+        //! Copy constructor
+        Image(const Image& rhs) = delete;
+        //! Assignment operator
+        Image& operator=(const Image& rhs) = delete;
+        //@}
+
     protected:
         // DATA
         BasicIo::UniquePtr  io_;                //!< Image data IO pointer
@@ -502,14 +510,6 @@ namespace Exiv2 {
         static const char* typeName(uint16_t tag);
 
     private:
-        //! @name NOT implemented
-        //@{
-        //! Copy constructor
-        Image(const Image& rhs);
-        //! Assignment operator
-        Image& operator=(const Image& rhs);
-        //@}
-
         // DATA
         int               imageType_;         //!< Image type
         uint16_t          supportedMetadata_; //!< Bitmap with all supported metadata types
@@ -709,13 +709,12 @@ namespace Exiv2 {
         */
         static bool checkType(int type, BasicIo& io, bool advance);
 
-    private:
         //! @name Creators
         //@{
         //! Prevent construction: not implemented.
-        ImageFactory();
+        ImageFactory() = delete;
         //! Prevent copy construction: not implemented.
-        ImageFactory(const ImageFactory& rhs);
+        ImageFactory(const ImageFactory& rhs) = delete;
         //@}
 
     }; // class ImageFactory

include/exiv2/jp2image.hpp

@@ -94,13 +94,14 @@ namespace Exiv2
         std::string mimeType() const;
         //@}
 
-    private:
         //! @name NOT Implemented
         //@{
         //! Copy constructor
-        Jp2Image(const Jp2Image& rhs);
+        Jp2Image(const Jp2Image& rhs) = delete;
         //! Assignment operator
-        Jp2Image& operator=(const Jp2Image& rhs);
+        Jp2Image& operator=(const Jp2Image& rhs) = delete;
+
+    private:
         /*!
           @brief Provides the main implementation of writeMetadata() by
                 writing all buffered metadata to the provided BasicIo.