add an EbmlMaster variant of tEBML_CONTEXT

Hopefully the compiler picks the most appropriate one ?
Matroska-Org · Feb 26, 2024 · 9e6f5b5 · 9e6f5b5
1 parent 184d3e1
commit 9e6f5b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ebml/EbmlMaster.h b/ebml/EbmlMaster.h
@@ -152,6 +152,11 @@ class EBML_DLL_API EbmlMaster : public EbmlElement {
     bool ProcessMandatory();
 };
 
+static inline constexpr const EbmlSemanticContextMaster & tEBML_CONTEXT(const EbmlMaster * e)
+{
+  return e->ContextMaster();
+}
+
 ///< \todo add a restriction to only elements legal in the context
 template <typename Type>
 Type & GetChild(EbmlMaster & Master)

diff --git a/test/test_macros.cxx b/test/test_macros.cxx
@@ -147,6 +147,10 @@ int main(void)
 
     [[maybe_unused]] const EbmlSemanticContext &ctx = EBML_CLASS_CONTEXT(EbmlHead);
     [[maybe_unused]] const EbmlSemanticContextMaster &ctxMaster = EBML_CLASS_CONTEXT(EbmlHead);
+    EbmlHead TestHead;
+    [[maybe_unused]] const EbmlSemanticContextMaster & MasterContext = EBML_CONTEXT(&TestHead);
+    [[maybe_unused]] const EbmlSemanticContext & BasicContext = EBML_CONTEXT(&TestHead);
+    [[maybe_unused]] const auto & AutoContext = EBML_CONTEXT(&TestHead);
 
     return 0;
 }