Ticket #2327: avifile-0.7-0.7.45-gcc4.patch

avifile-0.7-0.7.45/include/avm_map.h

@@ -33 +33 @@
 template <class Key, class Value, class Compare = less<Key>, class equal = equal<Key> > class avm_map
 {
 protected:
-    template <class Key1, class Value1> struct pair
+    template <class KeyP, class ValueP> struct pair
     {
-        Key1 key;
-        Value1 value;
+        KeyP key;
+        ValueP value;
         pair() : key(Key()), value(Value()) {}
-        pair(Key1 k, Value1 v) : key(k), value(v) {}
-        pair(const pair<Key1, Value1>& p) : key(p.key), value(p.value) {}
+        pair(KeyP k, ValueP v) : key(k), value(v) {}
+        pair(const pair<KeyP, ValueP>& p) : key(p.key), value(p.value) {}
     };
     typedef pair<Key, Value> _Tpair;
 
     template <class Key1, class Value1> struct binary_tree_node
     {
-        avm_map::pair<Key1, Value1>* entry;
+        _Tpair* entry;
         binary_tree_node<Key1, Value1>* left;
         Key1 minval;
         binary_tree_node<Key1, Value1>* right;

avifile-0.7-0.7.45/plugins/libmp3lame_audioenc/mp3encoder.cpp

@@ -30 +30 @@
         short  nCodecDelay;
     };
 public:
-    MP3Encoder::MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format)
+    MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format)
         :IAudioEncoder(info)
     {
         in_fmt=*format;