]>
Commit | Line | Data |
---|---|---|
cd43ff6a | 1 | --- ./thirdparty/speech_tools/include/EST_TIterator.h.orig 2012-09-19 01:09:15.328399159 +0100 |
2 | +++ ./thirdparty/speech_tools/include/EST_TIterator.h 2012-09-19 01:09:45.291736803 +0100 | |
3 | @@ -101,7 +101,7 @@ | |
4 | ||
5 | /// Create an iterator ready to run over the given container. | |
6 | EST_TIterator(const Container &over) | |
7 | - { begin(over); } | |
8 | + { this->begin(over); } | |
9 | ||
10 | /// Copy an iterator by assignment | |
11 | Iter &operator = (const Iter &orig) | |
12 | @@ -109,7 +109,7 @@ | |
13 | ||
14 | /// Assigning a container to an iterator sets it ready to start. | |
15 | Iter &operator = (const Container &over) | |
16 | - { begin(over); return *this;} | |
17 | + { this->begin(over); return *this;} | |
18 | ||
19 | /// Set the iterator ready to run over this container. | |
20 | void begin(const Container &over) | |
21 | @@ -209,7 +209,7 @@ | |
22 | ||
23 | /// Create an iterator ready to run over the given container. | |
24 | EST_TStructIterator(const Container &over) | |
25 | - { begin(over); } | |
26 | + { this->begin(over); } | |
27 | ||
28 | const Entry *operator ->() const | |
29 | {return &this->current();} | |
30 | @@ -239,7 +239,7 @@ | |
31 | ||
32 | /// Create an iterator ready to run over the given container. | |
33 | EST_TRwIterator(Container &over) | |
34 | - { begin(over); } | |
35 | + { this->begin(over); } | |
36 | ||
37 | /// Set the iterator ready to run over this container. | |
38 | void begin(Container &over) | |
39 | @@ -289,7 +289,7 @@ | |
40 | ||
41 | /// Create an iterator ready to run over the given container. | |
42 | EST_TRwStructIterator(Container &over) | |
43 | - { begin(over); } | |
44 | + { this->begin(over); } | |
45 | ||
46 | Entry *operator ->() const | |
47 | {return &this->current();} | |
48 | --- ./thirdparty/speech_tools/include/EST_TNamedEnum.h.orig 2012-09-19 01:13:32.548424745 +0100 | |
49 | +++ ./thirdparty/speech_tools/include/EST_TNamedEnum.h 2012-09-19 01:13:17.705090022 +0100 | |
50 | @@ -130,7 +130,7 @@ | |
51 | {this->initialise((const void *)defs); }; | |
52 | EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *)) | |
53 | {this->initialise((const void *)defs, conv); }; | |
54 | - const char *name(ENUM tok, int n=0) const {return value(tok,n); }; | |
55 | + const char *name(ENUM tok, int n=0) const {return this->value(tok,n); }; | |
56 | ||
57 | }; | |
58 | ||
59 | --- ./thirdparty/speech_tools/base_class/EST_TSimpleMatrix.cc.orig 2012-09-19 01:15:38.485103201 +0100 | |
60 | +++ ./thirdparty/speech_tools/base_class/EST_TSimpleMatrix.cc 2012-09-19 01:17:50.905115595 +0100 | |
61 | @@ -40,6 +40,7 @@ | |
62 | /* */ | |
63 | /*************************************************************************/ | |
64 | ||
65 | +#include <string.h> | |
66 | #include "EST_TSimpleMatrix.h" | |
67 | #include "EST_TVector.h" | |
68 | #include <fstream> | |
69 | @@ -97,7 +98,7 @@ | |
70 | { | |
71 | int copy_r = Lof(this->num_rows(), new_rows); | |
72 | ||
73 | - just_resize(new_rows, new_cols, &old_vals); | |
74 | + this->just_resize(new_rows, new_cols, &old_vals); | |
75 | ||
76 | // memcpy((void *)this->p_memory, | |
77 | // (const void *)old_vals, | |
78 | @@ -131,9 +132,9 @@ | |
79 | int copy_r = Lof(this->num_rows(), new_rows); | |
80 | int copy_c = Lof(this->num_columns(), new_cols); | |
81 | ||
82 | - just_resize(new_rows, new_cols, &old_vals); | |
83 | + this->just_resize(new_rows, new_cols, &old_vals); | |
84 | ||
85 | - set_values(old_vals, | |
86 | + this->set_values(old_vals, | |
87 | old_row_step, old_column_step, | |
88 | 0, copy_r, | |
89 | 0, copy_c); | |
90 | --- ./thirdparty/speech_tools/base_class/EST_TSimpleVector.cc.orig 2012-09-19 01:19:09.475122864 +0100 | |
91 | +++ ./thirdparty/speech_tools/base_class/EST_TSimpleVector.cc 2012-09-19 01:25:22.538491189 +0100 | |
92 | @@ -40,6 +40,7 @@ | |
93 | /* */ | |
94 | /*************************************************************************/ | |
95 | ||
96 | +#include <string.h> | |
97 | #include "EST_TSimpleVector.h" | |
98 | #include "EST_matrix_support.h" | |
99 | #include <fstream> | |
100 | @@ -70,7 +71,7 @@ | |
101 | T *old_vals =NULL; | |
102 | int old_offset = this->p_offset; | |
103 | ||
104 | - just_resize(newn, &old_vals); | |
105 | + this->just_resize(newn, &old_vals); | |
106 | ||
107 | if (set && old_vals) | |
108 | { | |
109 | --- thirdparty/speech_tools/config/systems/Linux.mak~ 2001-04-04 12:55:32.000000000 +0100 | |
110 | +++ thirdparty/speech_tools/config/systems/Linux.mak 2012-09-19 01:38:58.025234161 +0100 | |
111 | @@ -52,7 +52,7 @@ | |
112 | NATIVE_AUDIO_MODULE = LINUX16 | |
113 | ||
114 | ## echo -n doesn't work | |
115 | -ECHO_N = /usr/bin/printf "%s" | |
116 | +ECHO_N = /bin/printf "%s" | |
117 | ||
118 | GNUTEST=test | |
119 |