Delete all the non-virtual default destructors

include/podio/CollectionBufferFactory.h

@@ -39,7 +39,6 @@ class CollectionBufferFactory {
   CollectionBufferFactory& operator=(CollectionBufferFactory const&) = delete;
   CollectionBufferFactory(CollectionBufferFactory&&) = delete;
   CollectionBufferFactory& operator=(CollectionBufferFactory&&) = delete;
-  ~CollectionBufferFactory() = default;
 
   /// Mutable instance only used for the initial registration of functions
   /// during library loading

include/podio/CollectionIDTable.h

@@ -14,7 +14,6 @@ class CollectionIDTable {
 
 public:
   CollectionIDTable();
-  ~CollectionIDTable() = default;
 
   CollectionIDTable(const CollectionIDTable&) = delete;
   CollectionIDTable& operator=(const CollectionIDTable&) = delete;

include/podio/DatamodelRegistry.h

@@ -55,7 +55,6 @@ class DatamodelRegistry {
   // Mutable instance only used for the initial registration!
   static DatamodelRegistry& mutInstance();
 
-  ~DatamodelRegistry() = default;
   DatamodelRegistry(const DatamodelRegistry&) = delete;
   DatamodelRegistry& operator=(const DatamodelRegistry&) = delete;
   DatamodelRegistry(DatamodelRegistry&&) = delete;

include/podio/Frame.h

@@ -92,7 +92,6 @@ class Frame {
   struct FrameModel final : FrameConcept, public ICollectionProvider {
 
     FrameModel(std::unique_ptr<FrameDataT> data);
-    ~FrameModel() = default;
     FrameModel(const FrameModel&) = delete;
     FrameModel& operator=(const FrameModel&) = delete;
     FrameModel(FrameModel&&) = default;
@@ -179,13 +178,6 @@ class Frame {
   /// Frame move assignment operator
   Frame& operator=(Frame&&) = default;
 
-  /// Frame destructor
-  ///
-  /// @note Since the Frame owns all the collections that have been put into it,
-  /// or that can be obtained from it, this invalidates all references to these
-  /// collections.
-  ~Frame() = default;
-
   /// Get a collection from the Frame by name.
   ///
   /// @tparam CollT The type of the desired collection

include/podio/GenericParameters.h

@@ -66,8 +66,6 @@ class GenericParameters {
   GenericParameters(GenericParameters&&) = default;
   GenericParameters& operator=(GenericParameters&&) = default;
 
-  ~GenericParameters() = default;
-
   template <typename T>
   std::optional<T> get(const std::string& key) const;
 

include/podio/LinkNavigator.h

@@ -67,7 +67,6 @@ class LinkNavigator {
   LinkNavigator& operator=(const LinkNavigator&) = default;
   LinkNavigator(LinkNavigator&&) = default;
   LinkNavigator& operator=(LinkNavigator&&) = default;
-  ~LinkNavigator() = default;
 
   /// Get all the *From* objects and weights that have links with the passed
   /// object

include/podio/RNTupleReader.h

@@ -33,8 +33,6 @@ class RNTupleReader {
 public:
   /// Create a RNTupleReader
   RNTupleReader() = default;
-  /// Destructor
-  ~RNTupleReader() = default;
   /// The RNTupleReader is not copy-able
   RNTupleReader(const RNTupleReader&) = delete;
   /// The RNTupleReader is not copy-able

include/podio/ROOTLegacyReader.h

@@ -46,9 +46,6 @@ class ROOTLegacyReader {
 public:
   /// Create a SIOLegacyReader
   ROOTLegacyReader() = default;
-  /// Destructor
-  ~ROOTLegacyReader() = default;
-
   /// The SIOLegacyReader is not copy-able
   ROOTLegacyReader(const ROOTLegacyReader&) = delete;
   /// The SIOLegacyReader is not copy-able

include/podio/ROOTReader.h

@@ -45,9 +45,6 @@ class ROOTReader {
 public:
   /// Create a ROOTReader
   ROOTReader() = default;
-  /// Destructor
-  ~ROOTReader() = default;
-
   /// The ROOTReader is not copy-able
   ROOTReader(const ROOTReader&) = delete;
   /// The ROOTReader is not copy-able

include/podio/Reader.h

@@ -42,8 +42,6 @@ class Reader {
     ReaderModel(ReaderModel&&) = default;
     ReaderModel& operator=(ReaderModel&&) = default;
 
-    ~ReaderModel() = default;
-
     podio::Frame readNextFrame(const std::string& name) override {
       auto maybeFrame = m_reader->readNextEntry(name);
       if (maybeFrame) {
@@ -100,7 +98,6 @@ class Reader {
   Reader& operator=(const Reader&) = delete;
   Reader(Reader&&) = default;
   Reader& operator=(Reader&&) = default;
-  ~Reader() = default;
 
   /// Read the next frame of a given category
   ///

include/podio/SIOLegacyReader.h

@@ -28,9 +28,6 @@ class SIOLegacyReader {
 public:
   /// Create a SIOLegacyReader
   SIOLegacyReader();
-  /// Destructor
-  ~SIOLegacyReader() = default;
-
   /// The SIOLegacyReader is not copy-able
   SIOLegacyReader(const SIOLegacyReader&) = delete;
   /// The SIOLegacyReader is not copy-able

include/podio/SIOReader.h

@@ -27,9 +27,6 @@ class SIOReader {
 public:
   /// Create an SIOReader
   SIOReader();
-  /// SIOReader destructor
-  ~SIOReader() = default;
-
   /// The SIOReader is not copy-able
   SIOReader(const SIOReader&) = delete;
   /// The SIOReader is not copy-able

include/podio/SchemaEvolution.h

@@ -61,7 +61,6 @@ class SchemaEvolution {
   SchemaEvolution& operator=(const SchemaEvolution&) = delete;
   SchemaEvolution(SchemaEvolution&&) = delete;
   SchemaEvolution& operator=(SchemaEvolution&&) = delete;
-  ~SchemaEvolution() = default;
 
   /// Mutable instance only used for the initial registration of functions
   /// during library loading

include/podio/UserDataCollection.h

@@ -85,7 +85,6 @@ class UserDataCollection : public CollectionBase {
   UserDataCollection& operator=(const UserDataCollection&) = delete;
   UserDataCollection(UserDataCollection&&) = default;
   UserDataCollection& operator=(UserDataCollection&&) = default;
-  ~UserDataCollection() = default;
 
   /// The schema version of UserDataCollections
   static constexpr SchemaVersionT schemaVersion = 1;

include/podio/Writer.h

@@ -38,8 +38,6 @@ class Writer {
     WriterModel(WriterModel&&) = default;
     WriterModel& operator=(WriterModel&&) = default;
 
-    ~WriterModel() = default;
-
     void writeFrame(const podio::Frame& frame, const std::string& category,
                     const std::vector<std::string>& collections) override {
       return m_writer->writeFrame(frame, category, collections);
@@ -66,12 +64,6 @@ class Writer {
   Writer(Writer&&) = default;
   Writer& operator=(Writer&&) = default;
 
-  /// Destructor
-  ///
-  /// This also takes care of writing all the necessary metadata to read files
-  /// back again.
-  ~Writer() = default;
-
   /// Store the given frame with the given category
   ///
   /// This stores all available categories from the passed frame

include/podio/detail/Link.h

@@ -107,9 +107,6 @@ class LinkT {
     return {nullptr};
   }
 
-  /// Destructor
-  ~LinkT() = default;
-
   /// Get the weight of the link
   float getWeight() const {
     return m_obj->data.weight;

include/podio/detail/LinkCollectionData.h

@@ -42,7 +42,6 @@ class LinkCollectionData {
   LinkCollectionData& operator=(const LinkCollectionData&) = delete;
   LinkCollectionData(LinkCollectionData&&) = default;
   LinkCollectionData& operator=(LinkCollectionData&&) = default;
-  ~LinkCollectionData() = default;
 
   podio::CollectionWriteBuffers getCollectionBuffers(bool isSubsetColl) {
     return {isSubsetColl ? nullptr : (void*)&m_data, (void*)m_data.get(), &m_refCollections, &m_vecInfo};

include/podio/detail/LinkObj.h

@@ -37,9 +37,6 @@ class LinkObj {
   /// No assignment operator
   LinkObj& operator=(const LinkObj&) = delete;
 
-  /// Destructor
-  ~LinkObj() = default;
-
 public:
   podio::ObjectID id{};
   LinkData data{1.0f};

include/podio/utilities/DatamodelRegistryIOHelpers.h

@@ -44,7 +44,6 @@ class DatamodelDefinitionHolder {
   }
 
   DatamodelDefinitionHolder() = default;
-  ~DatamodelDefinitionHolder() = default;
   DatamodelDefinitionHolder(const DatamodelDefinitionHolder&) = delete;
   DatamodelDefinitionHolder& operator=(const DatamodelDefinitionHolder&) = delete;
   DatamodelDefinitionHolder(DatamodelDefinitionHolder&&) = default;

include/podio/utilities/RootHelpers.h

@@ -30,7 +30,6 @@ namespace root_utils {
   /// get them from a TTree/TChain for every event.
   struct CollectionBranches {
     CollectionBranches() = default;
-    ~CollectionBranches() = default;
     CollectionBranches(const CollectionBranches&) = delete;
     CollectionBranches& operator=(const CollectionBranches&) = delete;
     CollectionBranches(CollectionBranches&&) = default;
@@ -51,7 +50,6 @@ namespace root_utils {
   template <typename T>
   struct ParamStorage {
     ParamStorage() = default;
-    ~ParamStorage() = default;
     ParamStorage(const ParamStorage&) = delete;
     ParamStorage& operator=(const ParamStorage&) = delete;
     ParamStorage(ParamStorage&&) = default;

python/templates/CollectionData.h.jinja2

@@ -59,11 +59,6 @@ public:
   {{ class_type }}({{ class_type }}&& other) = default;
   {{ class_type }}& operator=({{ class_type }}&& other) = default;
 
-  /**
-   * Destructor
-   */
-  ~{{ class_type }}() = default;
-
   void clear(bool isSubsetColl);
 
   podio::CollectionWriteBuffers getCollectionBuffers(bool isSubsetColl);

python/templates/Interface.h.jinja2

@@ -65,7 +65,6 @@ private:
 
   template<typename ValueT>
   struct Model final : Concept {
-    ~Model() = default;
     Model(ValueT value) : m_value(value) {}
 
     std::unique_ptr<Concept> clone() const final {
@@ -115,7 +114,6 @@ public:
     return *this;
   }
 
-  ~{{ class.bare_type }}() = default;
   {{ class.bare_type }}({{ class.bare_type }}&&) = default;
   {{ class.bare_type }}& operator=({{ class.bare_type }}&&) = default;
 

python/templates/macros/declarations.jinja2

@@ -76,9 +76,6 @@
   /// create a mutable deep-copy of the object with identical relations
   /// if cloneRelations=false, the relations are not cloned and will be empty
   Mutable{{ type }} clone(bool cloneRelations=true) const;
-
-  /// destructor
-  ~{{  full_type }}() = default;
 {% endmacro %}