From 1386e61fa3e5123c152c12de871012a7bff7bca2 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 26 Apr 2004 19:45:13 +0000
Subject: [PATCH] Fixes for compilation with gcc 3.4.

---
 ChangeLog         |  4 +++
 aviclasses/list.h | 64 +++++++++++++++++++++++------------------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 419dafae0..4ac9f262f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-26  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge: Fixes for compilation with gcc 3.4.
+
 2004-04-24  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: bug fix: Some strings read from RealMedia files were
diff --git a/aviclasses/list.h b/aviclasses/list.h
index fdac36ea6..89d516528 100644
--- a/aviclasses/list.h
+++ b/aviclasses/list.h
@@ -137,7 +137,7 @@ public:
   T *begin() const { return AtHead(); }
   T *end() const { return AtTail(); }
 
-  void take(List2<T>& from) { List::take(from); }
+  void take(List2<T>& from) { List::Take(from); }
 
   class iterator {
   protected:
@@ -163,28 +163,28 @@ public:
     fwit() throw() {}
     fwit(const fwit& src) throw() : iterator(src) {}
     fwit(ListNode2<T> *start) throw() {
-      node = start;
-      next = start->NextFromHead();
+      iterator::node = start;
+      iterator::next = start->NextFromHead();
     }
 
     const fwit& operator=(ListNode2<T> *start) throw() {
-      node = start;
-      next = start->NextFromHead();
+      iterator::node = start;
+      iterator::next = start->NextFromHead();
 
       return *this;
     }
 
     fwit& operator++() throw() {
-      node = next;
-      next = node->NextFromHead();
+      iterator::node = iterator::next;
+      iterator::next = iterator::node->NextFromHead();
 
       return *this;
     }
 
     const fwit& operator+=(int v) throw() {
-      while(next && v--) {
-        node = next;
-        next = node->NextFromHead();
+      while(iterator::next && v--) {
+        iterator::node = iterator::next;
+        iterator::next = iterator::node->NextFromHead();
       }
 
       return *this;
@@ -210,28 +210,28 @@ public:
     rvit() throw() {}
 
     rvit(ListNode2<T> *start) throw() {
-      node = start;
-      next = start->NextFromTail();
+      iterator::node = iterator::start;
+      iterator::next = iterator::start->NextFromTail();
     }
 
     const rvit& operator=(ListNode2<T> *start) throw() {
-      node = start;
-      next = start->NextFromTail();
+      iterator::node = iterator::start;
+      iterator::next = iterator::start->NextFromTail();
 
       return *this;
     }
 
     rvit& operator--() throw() {
-      node = next;
-      next = node->NextFromTail();
+      iterator::node = iterator::next;
+      iterator::next = iterator::node->NextFromTail();
 
       return *this;
     }
 
     const rvit& operator-=(int v) throw() {
-      while(next && v--) {
-        node = next;
-        next = node->NextFromTail();
+      while(iterator::next && v--) {
+        iterator::node = iterator::next;
+        iterator::next = iterator::node->NextFromTail();
       }
 
       return *this;
@@ -253,20 +253,20 @@ public:
   };
 };
 
-template<class T>
-class ListAlloc : public List2<T> {
-public:
-  ListAlloc<T>() {}
-  ~ListAlloc<T>() {
-    dispose();
-  }
+/* template<class T> */
+/* class ListAlloc : public List2<T> { */
+/* public: */
+/*   ListAlloc<T>() {} */
+/*   ~ListAlloc<T>() { */
+/*     dispose(); */
+/*   } */
 
-  void dispose() {
-    T *node;
+/*   void dispose() { */
+/*     T *node; */
 
-    while(node = RemoveHead())
-      delete node;
-  }
-};
+/*     while(node = RemoveHead()) */
+/*       delete node; */
+/*   } */
+/* }; */
 
 #endif