Cleanup: Explicit Destructors, Override

override implies virtual, add more destructors to classes, add default where appropriate.
openPMD · Dec 13, 2019 · 3ffa5a9 · 3ffa5a9
1 parent 7d5b0ce
commit 3ffa5a9
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 43 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,5 +1,5 @@
 # Future consideration: cppcoreguidelines-*,clang-analyzer-*,google-*,hicpp-*,llvm-*,misc-*,modernize-*,readability-*,-clang-diagnostic-unused-command-line-argument,-*-namespace-comment*,-*-braces-around-statements,-google-readability-todo,-readability-inconsistent-declaration-parameter-name,-readability-named-parameter
 # FIXME: all performance-* reports
 # FIXME: all cert-* reports
-Checks: -*,bugprone-*,cppcoreguidelines-slicing,mpi-*,readability-non-const-parameter,modernize-use-override
+Checks: -*,bugprone-*,cppcoreguidelines-slicing,mpi-*,readability-non-const-parameter,modernize-use-override,modernize-use-equals-default
 HeaderFilterRegex: '((^(?!\/share\/openPMD\/).*)*include\/openPMD\/.+\.hpp|src\/^(?!binding).+\.cpp$)'
diff --git a/include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp b/include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp
@@ -102,7 +102,7 @@ class ADIOS2IOHandlerImpl
     explicit ADIOS2IOHandlerImpl( AbstractIOHandler * );
 
 
-    ~ADIOS2IOHandlerImpl( ) override;
+    ~ADIOS2IOHandlerImpl( ) override = default;
 
     std::future< void > flush( ) override;
 
@@ -641,7 +641,10 @@ friend class ADIOS2IOHandlerImpl;
     ADIOS2IOHandlerImpl m_impl;
 
 public:
-    ~ADIOS2IOHandler( ) override;
+    ~ADIOS2IOHandler( ) override
+    {
+        this->flush( );
+    }
 
 #else
 public:

diff --git a/include/openPMD/IO/AbstractFilePosition.hpp b/include/openPMD/IO/AbstractFilePosition.hpp
@@ -26,6 +26,6 @@ namespace openPMD
 class AbstractFilePosition
 {
 public:
-    virtual ~AbstractFilePosition() { }
+    virtual ~AbstractFilePosition() = default;
 }; // AbstractFilePosition
 } // openPMD
diff --git a/include/openPMD/IO/DummyIOHandler.hpp b/include/openPMD/IO/DummyIOHandler.hpp
@@ -36,7 +36,7 @@ namespace openPMD
     {
     public:
         DummyIOHandler(std::string, AccessType);
-        ~DummyIOHandler();
+        ~DummyIOHandler() override = default;
 
         /** No-op consistent with the IOHandler interface to enable library use without IO.
         */

diff --git a/include/openPMD/IO/HDF5/HDF5IOHandlerImpl.hpp b/include/openPMD/IO/HDF5/HDF5IOHandlerImpl.hpp
@@ -36,7 +36,7 @@ namespace openPMD
     {
     public:
         HDF5IOHandlerImpl(AbstractIOHandler*);
-        virtual ~HDF5IOHandlerImpl();
+        ~HDF5IOHandlerImpl() override;
 
         void createFile(Writable*, Parameter< Operation::CREATE_FILE > const&) override;
         void createPath(Writable*, Parameter< Operation::CREATE_PATH > const&) override;

diff --git a/include/openPMD/IO/HDF5/ParallelHDF5IOHandlerImpl.hpp b/include/openPMD/IO/HDF5/ParallelHDF5IOHandlerImpl.hpp
@@ -38,7 +38,7 @@ namespace openPMD
     {
     public:
         ParallelHDF5IOHandlerImpl(AbstractIOHandler*, MPI_Comm);
-        virtual ~ParallelHDF5IOHandlerImpl();
+        ~ParallelHDF5IOHandlerImpl() override;
 
         MPI_Comm m_mpiComm;
         MPI_Info m_mpiInfo;

diff --git a/include/openPMD/Mesh.hpp b/include/openPMD/Mesh.hpp
@@ -43,6 +43,7 @@ class Mesh : public BaseRecord< MeshRecordComponent >
 public:
     Mesh(Mesh const&) = default;
     Mesh& operator=(Mesh const&) = default;
+    ~Mesh() override = default;
 
     /** @brief Enumerated datatype for the geometry of the mesh.
      *

diff --git a/include/openPMD/ParticlePatches.hpp b/include/openPMD/ParticlePatches.hpp
@@ -37,9 +37,10 @@ namespace openPMD
 
     public:
         size_t numPatches() const;
+        ~ParticlePatches() override = default;
 
     private:
-        ParticlePatches();
+        ParticlePatches() = default;
         void read();
     }; // ParticlePatches
 

diff --git a/include/openPMD/ParticleSpecies.hpp b/include/openPMD/ParticleSpecies.hpp
@@ -41,7 +41,7 @@ class ParticleSpecies : public Container< Record >
     ParticlePatches particlePatches;
 
 private:
-    ParticleSpecies();
+    ParticleSpecies() = default;
 
     void read();
     void flush(std::string const &) override;

diff --git a/include/openPMD/Record.hpp b/include/openPMD/Record.hpp
@@ -37,9 +37,9 @@ class Record : public BaseRecord< RecordComponent >
     friend class ParticleSpecies;
 
 public:
-    Record(Record const&);
-    Record& operator=(Record const&);
-    ~Record() override;
+    Record(Record const&) = default;
+    Record& operator=(Record const&) = default;
+    ~Record() override = default;
 
     Record& setUnitDimension(std::map< UnitDimension, double > const&);
 

diff --git a/include/openPMD/backend/BaseRecord.hpp b/include/openPMD/backend/BaseRecord.hpp
@@ -67,13 +67,12 @@ class BaseRecord : public Container< T_elem >
 
 protected:
     BaseRecord();
-
     void readBase();
 
     std::shared_ptr< bool > m_containsScalar;
 
 private:
-    virtual void flush(std::string const&) final;
+    void flush(std::string const&) final;
     virtual void flush_impl(std::string const&) = 0;
     virtual void read() = 0;
 };  //BaseRecord

diff --git a/include/openPMD/backend/BaseRecordComponent.hpp b/include/openPMD/backend/BaseRecordComponent.hpp
@@ -46,8 +46,7 @@ class BaseRecordComponent : public Attributable
     class Container;
 
 public:
-    virtual ~BaseRecordComponent()
-    { }
+    ~BaseRecordComponent() override = default;
 
     double unitSI() const;
 

diff --git a/include/openPMD/backend/Container.hpp b/include/openPMD/backend/Container.hpp
@@ -91,7 +91,7 @@ class Container : public Attributable
     using const_iterator = typename InternalContainer::const_iterator;
 
     Container(Container const&) = default;
-    virtual ~Container() { }
+    virtual ~Container() = default;
 
     iterator begin() noexcept { return m_container->begin(); }
     const_iterator begin() const noexcept { return m_container->begin(); }

diff --git a/include/openPMD/backend/MeshRecordComponent.hpp b/include/openPMD/backend/MeshRecordComponent.hpp
@@ -44,6 +44,8 @@ class MeshRecordComponent : public RecordComponent
     void read() override;
 
 public:
+    ~MeshRecordComponent() override = default;
+
     template< typename T >
     std::vector< T > position() const;
     template< typename T >

diff --git a/include/openPMD/backend/PatchRecord.hpp b/include/openPMD/backend/PatchRecord.hpp
@@ -37,9 +37,10 @@ class PatchRecord : public BaseRecord< PatchRecordComponent >
 
 public:
     PatchRecord& setUnitDimension(std::map< UnitDimension, double > const&);
+    ~PatchRecord() override = default;
 
 private:
-    PatchRecord();
+    PatchRecord() = default;
 
     void flush_impl(std::string const&) override;
     void read() override;

diff --git a/include/openPMD/backend/Writable.hpp b/include/openPMD/backend/Writable.hpp
@@ -52,7 +52,7 @@ class AbstractIOHandlerImplCommon;
  *                      - whether the logical object has been modified compared
  *                        to last persistent state
  */
-class Writable
+class Writable final
 {
     friend class Attributable;
     template< typename T_elem >
@@ -81,7 +81,7 @@ class Writable
 
 public:
     Writable(Attributable* = nullptr);
-    virtual ~Writable();
+    ~Writable() = default;
 
 OPENPMD_private:
     std::shared_ptr< AbstractFilePosition > abstractFilePosition;

diff --git a/src/IO/ADIOS/ADIOS2IOHandler.cpp b/src/IO/ADIOS/ADIOS2IOHandler.cpp
@@ -76,11 +76,6 @@ ADIOS2IOHandlerImpl::ADIOS2IOHandlerImpl( AbstractIOHandler * handler )
 {
 }
 
-ADIOS2IOHandlerImpl::~ADIOS2IOHandlerImpl( )
-{
-    this->flush( );
-}
-
 std::future< void > ADIOS2IOHandlerImpl::flush( )
 {
     auto res = AbstractIOHandlerImpl::flush( );
@@ -1333,12 +1328,6 @@ ADIOS2IOHandler::ADIOS2IOHandler( std::string path, AccessType at )
 {
 }
 
-
-ADIOS2IOHandler::~ADIOS2IOHandler( )
-{
-    this->flush( );
-}
-
 std::future< void > ADIOS2IOHandler::flush( )
 {
     return m_impl.flush( );

diff --git a/src/IO/DummyIOHandler.cpp b/src/IO/DummyIOHandler.cpp
@@ -30,8 +30,6 @@ namespace openPMD
             : AbstractIOHandler(std::move(path), at)
     { }
 
-    DummyIOHandler::~DummyIOHandler() = default;
-
     void DummyIOHandler::enqueue(IOTask const&)
     { }
 

diff --git a/src/ParticlePatches.cpp b/src/ParticlePatches.cpp
@@ -23,7 +23,6 @@
 
 namespace openPMD
 {
-ParticlePatches::ParticlePatches() = default;
 
 size_t
 ParticlePatches::numPatches() const

diff --git a/src/ParticleSpecies.cpp b/src/ParticleSpecies.cpp
@@ -25,7 +25,6 @@
 
 namespace openPMD
 {
-ParticleSpecies::ParticleSpecies() = default;
 
 void
 ParticleSpecies::read()

diff --git a/src/Record.cpp b/src/Record.cpp
@@ -30,10 +30,6 @@ Record::Record()
     setTimeOffset(0.f);
 }
 
-Record::Record(Record const&) = default;
-Record& Record::operator=(Record const&) = default;
-Record::~Record() = default;
-
 Record&
 Record::setUnitDimension(std::map< UnitDimension, double > const& udim)
 {

diff --git a/src/backend/PatchRecord.cpp b/src/backend/PatchRecord.cpp
@@ -37,8 +37,6 @@ PatchRecord::setUnitDimension(std::map< UnitDimension, double > const& udim)
     return *this;
 }
 
-PatchRecord::PatchRecord() = default;
-
 void
 PatchRecord::flush_impl(std::string const& path)
 {

diff --git a/src/backend/Writable.cpp b/src/backend/Writable.cpp
@@ -33,6 +33,4 @@ Writable::Writable(Attributable* a)
           written{false}
 { }
 
-Writable::~Writable() = default;
-
 } // openPMD
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,8 +30,6 @@ namespace openPMD @@
                 : AbstractIOHandler(std::move(path), at)
         { }
-        DummyIOHandler::~DummyIOHandler() = default;
         void DummyIOHandler::enqueue(IOTask const&)
         { }
@@ Expand Down @@