From: Steve Lhomme Date: Thu, 18 Mar 2010 17:08:57 +0000 (+0000) Subject: use a macro for the EbmlMaster iterator as it may differ between versions of libebml X-Git-Tag: release-0.9.0~43 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c65c9165434c516afc510e1f4238bd11e8aaaf63;p=libmatroska use a macro for the EbmlMaster iterator as it may differ between versions of libebml git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@39 a6f86f6d-0131-4f8e-9e7b-e335508773d5 --- diff --git a/src/KaxCluster.cpp b/src/KaxCluster.cpp index 4524739..c110b09 100644 --- a/src/KaxCluster.cpp +++ b/src/KaxCluster.cpp @@ -75,7 +75,7 @@ KaxCluster::KaxCluster(const KaxCluster & ElementToClone) ,bSilentTracksUsed(ElementToClone.bSilentTracksUsed) { // update the parent of each children - std::vector::const_iterator Itr = begin(); + EBML_MASTER_ITERATOR Itr = begin(); while (Itr != end()) { if (EbmlId(**Itr) == EBML_ID(KaxBlockGroup)) { diff --git a/src/KaxSegment.cpp b/src/KaxSegment.cpp index 5a56fc7..ab09e51 100644 --- a/src/KaxSegment.cpp +++ b/src/KaxSegment.cpp @@ -83,7 +83,7 @@ KaxSegment::KaxSegment(const KaxSegment & ElementToClone) :EbmlMaster(ElementToClone) { // update the parent of each children - std::vector::const_iterator Itr = begin(); + EBML_MASTER_ITERATOR Itr = begin(); while (Itr != end()) { if (EbmlId(**Itr) == EBML_ID(KaxCluster)) {