From a8881ea3f1f7c562d7f7a2d04d6191b33c50cefe Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 6 Feb 2024 16:44:55 -0800 Subject: [PATCH] add missing destructors Found with MSVC warnings C4626,C5027 Signed-off-by: Rosen Penev --- ebml/EbmlElement.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/ebml/EbmlElement.h b/ebml/EbmlElement.h index 068e1162..d28d51c7 100644 --- a/ebml/EbmlElement.h +++ b/ebml/EbmlElement.h @@ -278,6 +278,10 @@ class EBML_DLL_API EbmlDocVersion { , maxver(max) {} + ~EbmlDocVersion() = default; + EbmlDocVersion(const EbmlDocVersion&) = delete; + EbmlDocVersion& operator=(const EbmlDocVersion&) = delete; + // the element with this EbmlDocVersion should never be used if this methods return true bool IsAlwaysDeprecated() const { return minver == ANY_VERSION; @@ -331,6 +335,10 @@ class EBML_DLL_API EbmlCallbacks { assert(Creator!=nullptr); } + ~EbmlCallbacks() = default; + EbmlCallbacks(const EbmlCallbacks&) = default; + EbmlCallbacks& operator=(const EbmlCallbacks&) = delete; + inline const EbmlId & ClassId() const { return GlobalId; } inline constexpr const EbmlSemanticContext & GetContext() const { return Context; } inline const char * GetName() const { return DebugName; } @@ -359,6 +367,10 @@ class EBML_DLL_API EbmlCallbacksDefault : public EbmlCallbacks { :EbmlCallbacks(Creator, aGlobalId, false, hasDefault, aDebugName, aContext, aVersion) { } + + ~EbmlCallbacksDefault() = default; + EbmlCallbacksDefault(const EbmlCallbacksDefault&) = default; + EbmlCallbacksDefault& operator=(const EbmlCallbacksDefault&) = delete; }; template @@ -392,6 +404,10 @@ class EBML_DLL_API EbmlSemantic { inline explicit operator const EbmlCallbacks &() const { return Callbacks; } inline EbmlCallbacks const &GetCallbacks() const { return Callbacks; } + ~EbmlSemantic() = default; + EbmlSemantic(const EbmlSemantic&) = default; + EbmlSemantic& operator=(const EbmlSemantic&) = delete; + private: const bool Mandatory; ///< whether the element is mandatory in the context or not const bool Unique; @@ -414,6 +430,10 @@ class EBML_DLL_API EbmlSemanticContext { : GetGlobalContext(aGetGlobalContext), MyTable(aMyTable), Size(aSize), UpTable(aUpTable), MasterElt(aMasterElt) {} + ~EbmlSemanticContext() = default; + EbmlSemanticContext(const EbmlSemanticContext&) = delete; + EbmlSemanticContext& operator=(const EbmlSemanticContext&) = delete; + bool operator!=(const EbmlSemanticContext & aElt) const { return ((Size != aElt.Size) || (MyTable != aElt.MyTable) || (UpTable != aElt.UpTable) || (GetGlobalContext != aElt.GetGlobalContext) || @@ -617,6 +637,10 @@ class EBML_DLL_API EbmlElementDefault : public EbmlElement { :EbmlElement(classInfo, aDefaultSize, false) {} + ~EbmlElementDefault() override = default; + EbmlElementDefault(const EbmlElementDefault&) = default; + EbmlElementDefault& operator=(const EbmlElementDefault&) = delete; + bool IsDefaultValue() const final { if (!ElementSpec().HasDefault()) return false; @@ -637,6 +661,9 @@ class EBML_DLL_API EbmlElementDefaultSameStorage : public EbmlElementDefault using EbmlElementDefault::EbmlElementDefault; using EbmlElementDefault::operator const EbmlId &; + EbmlElementDefaultSameStorage(const EbmlElementDefaultSameStorage&) = default; + EbmlElementDefaultSameStorage& operator=(const EbmlElementDefaultSameStorage&) = delete; + EbmlElementDefaultSameStorage & SetValue(const T & NewValue) override { Value = NewValue; @@ -675,6 +702,9 @@ class EBML_DLL_API EbmlElementDefaultStorage : public EbmlElementDefault { using EbmlElementDefault::EbmlElementDefault; using EbmlElementDefault::operator const EbmlId &; + EbmlElementDefaultStorage(const EbmlElementDefaultStorage&) = default; + EbmlElementDefaultStorage& operator=(const EbmlElementDefaultStorage&) = delete; + EbmlElementDefaultStorage & SetValue(const T & NewValue) override { Value = static_cast(NewValue);