1 --- avifile-0.7-0.7.45/include/avm_map.h.gcc4 2007-02-22 10:58:56.000000000 +0100
2 +++ avifile-0.7-0.7.45/include/avm_map.h 2007-02-22 10:59:13.000000000 +0100
3 @@ -33,19 +33,19 @@
4 template <class Key, class Value, class Compare = less<Key>, class equal = equal<Key> > class avm_map
5 {
6 protected:
7 - template <class Key1, class Value1> struct pair
8 + template <class KeyP, class ValueP> struct pair
9 {
10 - Key1 key;
11 - Value1 value;
12 + KeyP key;
13 + ValueP value;
14 pair() : key(Key()), value(Value()) {}
15 - pair(Key1 k, Value1 v) : key(k), value(v) {}
16 - pair(const pair<Key1, Value1>& p) : key(p.key), value(p.value) {}
17 + pair(KeyP k, ValueP v) : key(k), value(v) {}
18 + pair(const pair<KeyP, ValueP>& p) : key(p.key), value(p.value) {}
19 };
20 typedef pair<Key, Value> _Tpair;
21
22 template <class Key1, class Value1> struct binary_tree_node
23 {
24 - avm_map::pair<Key1, Value1>* entry;
25 + _Tpair* entry;
26 binary_tree_node<Key1, Value1>* left;
27 Key1 minval;
28 binary_tree_node<Key1, Value1>* right;
29 --- avifile-0.7-0.7.45/plugins/libmp3lame_audioenc/mp3encoder.cpp.gcc4 2006-03-05 21:45:26.000000000 +0100
30 +++ avifile-0.7-0.7.45/plugins/libmp3lame_audioenc/mp3encoder.cpp 2007-02-22 10:45:57.000000000 +0100
31 @@ -30,7 +30,7 @@
32 short nCodecDelay;
33 };
34 public:
35 - MP3Encoder::MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format)
36 + MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format)
37 :IAudioEncoder(info)
38 {
39 in_fmt=*format;
|
