remove compatibility code wrt. presence of FindNextChild in libEBML

The version number requirement/check suffices.
This commit is contained in:
Moritz Bunkus 2021-02-21 14:52:44 +01:00
parent d51a372f82
commit b57f01b297
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
2 changed files with 0 additions and 46 deletions

View File

@ -30,44 +30,6 @@ if test x"$EBML_MATROSKA_INTERNAL" = xyes; then
fi fi
fi fi
AC_DEFUN([AX_EBML_FINDNEXTCHILD],[
AC_CACHE_CHECK([if libEBML contains FindNextChild], [ax_cv_ebml_findnextchild],[
if test x"$EBML_MATROSKA_INTERNAL" = xyes; then
ax_cv_ebml_findnextchild=yes
else
CXXFLAGS_SAVED=$CXXFLAGS
CXXFLAGS="$EBML_CFLAGS $MATROSKA_CFLAGS"
export CXXFLAGS
AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[
#include <matroska/KaxInfo.h>
#include <matroska/KaxSegment.h>
using namespace libebml;
using namespace libmatroska;
],
[
EbmlMaster *m = new KaxSegment;
EbmlElement *e = new KaxTitle;
FindNextChild(*m, *e);
],
[ax_cv_ebml_findnextchild="yes"],
[ax_cv_ebml_findnextchild="no"])
AC_LANG_POP
CXXFLAGS="$CXXFLAGS_SAVED"
fi
])
if test x"$ax_cv_ebml_findnextchild" = xyes; then
AC_DEFINE(HAVE_EBML_FINDNEXTCHILD, 1, [Define if libEBML contains FindNextChild])
fi
])
AX_EBML_FINDNEXTCHILD
AC_SUBST(EBML_MATROSKA_INTERNAL) AC_SUBST(EBML_MATROSKA_INTERNAL)
AC_SUBST(EBML_CFLAGS) AC_SUBST(EBML_CFLAGS)
AC_SUBST(EBML_LIBS) AC_SUBST(EBML_LIBS)

View File

@ -209,14 +209,6 @@ FindChild(libebml::EbmlElement const *e) {
return static_cast<A *>(m->FindFirstElt(EBML_INFO(A))); return static_cast<A *>(m->FindFirstElt(EBML_INFO(A)));
} }
#if !defined(HAVE_EBML_FINDNEXTCHILD)
template <typename A> A*
FindNextChild(libebml::EbmlMaster &Master,
A const &PastElt) {
return static_cast<A *>(Master.FindNextElt(PastElt, false));
}
#endif // !HAVE_EBML_FINDNEXTCHILD
template<typename A> A & template<typename A> A &
GetChild(libebml::EbmlMaster *m) { GetChild(libebml::EbmlMaster *m) {
return GetChild<A>(*m); return GetChild<A>(*m);