make the EbmlCallbacks constructor a constexpr

Matroska-Org · Dec 18, 2023 · 5159be2 · 5159be2
1 parent c4b33d1
commit 5159be2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/ebml/EbmlElement.h b/ebml/EbmlElement.h
@@ -254,7 +254,14 @@ extern const EbmlSemanticContext Context_EbmlGlobal;
 */
 class EBML_DLL_API EbmlCallbacks {
   public:
-    EbmlCallbacks(EbmlElement & (*Creator)(), const EbmlId & aGlobalId, const char * aDebugName, const EbmlSemanticContext & aContext);
+    constexpr EbmlCallbacks(EbmlElement & (*Creator)(), const EbmlId & aGlobalId, const char * aDebugName, const EbmlSemanticContext & aContext)
+      :Create(Creator)
+      ,GlobalId(aGlobalId)
+      ,DebugName(aDebugName)
+      ,Context(aContext)
+    {
+      assert(Creator!=nullptr);
+    }
 
         inline const EbmlId & ClassId() const { return GlobalId; }
         inline const EbmlSemanticContext & GetContext() const { return Context; }

diff --git a/src/EbmlElement.cpp b/src/EbmlElement.cpp
@@ -211,15 +211,6 @@ std::int64_t ReadCodedSizeSignedValue(const binary * InBuffer, std::uint32_t & B
 }
 
 
-EbmlCallbacks::EbmlCallbacks(EbmlElement & (*Creator)(), const EbmlId & aGlobalId, const char * aDebugName, const EbmlSemanticContext & aContext)
-  :Create(Creator)
-  ,GlobalId(aGlobalId)
-  ,DebugName(aDebugName)
-  ,Context(aContext)
-{
-  assert(Create!=nullptr);
-}
-
 const EbmlSemantic & EbmlSemanticContext::GetSemantic(std::size_t i) const
 {
   assert(i<Size);