|
 |
7b3626 |
--- speech_tools/include/EST_TIterator.h.orig 2012-02-25 12:09:30.926212818 -0600
|
|
|
7b3626 |
+++ speech_tools/include/EST_TIterator.h 2012-02-25 12:10:32.981099676 -0600
|
|
|
7b3626 |
@@ -101,7 +101,7 @@
|
|
|
7b3626 |
|
|
|
7b3626 |
/// Create an iterator ready to run over the given container.
|
|
|
7b3626 |
EST_TIterator(const Container &over)
|
|
|
7b3626 |
- { begin(over); }
|
|
|
7b3626 |
+ { this->begin(over); }
|
|
|
7b3626 |
|
|
|
7b3626 |
/// Copy an iterator by assignment
|
|
|
7b3626 |
Iter &operator = (const Iter &orig)
|
|
|
7b3626 |
@@ -109,7 +109,7 @@
|
|
|
7b3626 |
|
|
|
7b3626 |
/// Assigning a container to an iterator sets it ready to start.
|
|
|
7b3626 |
Iter &operator = (const Container &over)
|
|
|
7b3626 |
- { begin(over); return *this;}
|
|
|
7b3626 |
+ { this->begin(over); return *this;}
|
|
|
7b3626 |
|
|
|
7b3626 |
/// Set the iterator ready to run over this container.
|
|
|
7b3626 |
void begin(const Container &over)
|
|
|
7b3626 |
@@ -209,7 +209,7 @@
|
|
|
7b3626 |
|
|
|
7b3626 |
/// Create an iterator ready to run over the given container.
|
|
|
7b3626 |
EST_TStructIterator(const Container &over)
|
|
|
7b3626 |
- { begin(over); }
|
|
|
7b3626 |
+ { this->begin(over); }
|
|
|
7b3626 |
|
|
|
7b3626 |
const Entry *operator ->() const
|
|
|
7b3626 |
{return &this->current();}
|
|
|
7b3626 |
@@ -239,7 +239,7 @@
|
|
|
7b3626 |
|
|
|
7b3626 |
/// Create an iterator ready to run over the given container.
|
|
|
7b3626 |
EST_TRwIterator(Container &over)
|
|
|
7b3626 |
- { begin(over); }
|
|
|
7b3626 |
+ { this->begin(over); }
|
|
|
7b3626 |
|
|
|
7b3626 |
/// Set the iterator ready to run over this container.
|
|
|
7b3626 |
void begin(Container &over)
|
|
|
7b3626 |
@@ -289,7 +289,7 @@
|
|
|
7b3626 |
|
|
|
7b3626 |
/// Create an iterator ready to run over the given container.
|
|
|
7b3626 |
EST_TRwStructIterator(Container &over)
|
|
|
7b3626 |
- { begin(over); }
|
|
|
7b3626 |
+ { this->begin(over); }
|
|
|
7b3626 |
|
|
|
7b3626 |
Entry *operator ->() const
|
|
|
7b3626 |
{return &this->current();}
|
|
|
7b3626 |
--- speech_tools/include/EST_TNamedEnum.h.orig 2012-02-25 12:26:51.432455812 -0600
|
|
|
7b3626 |
+++ speech_tools/include/EST_TNamedEnum.h 2012-02-25 12:27:07.125450312 -0600
|
|
|
7b3626 |
@@ -130,7 +130,7 @@
|
|
|
7b3626 |
{this->initialise((const void *)defs); };
|
|
|
7b3626 |
EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *))
|
|
|
7b3626 |
{this->initialise((const void *)defs, conv); };
|
|
|
7b3626 |
- const char *name(ENUM tok, int n=0) const {return value(tok,n); };
|
|
|
7b3626 |
+ const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
|
|
|
7b3626 |
|
|
|
7b3626 |
};
|
|
|
7b3626 |
|
|
|
7b3626 |
--- speech_tools/base_class/EST_TSimpleMatrix.cc.orig 2012-02-25 12:34:37.095639209 -0600
|
|
|
7b3626 |
+++ speech_tools/base_class/EST_TSimpleMatrix.cc 2012-02-25 12:35:33.952865468 -0600
|
|
|
7b3626 |
@@ -97,7 +97,7 @@
|
|
|
7b3626 |
{
|
|
|
7b3626 |
int copy_r = Lof(this->num_rows(), new_rows);
|
|
|
7b3626 |
|
|
|
7b3626 |
- just_resize(new_rows, new_cols, &old_vals);
|
|
|
7b3626 |
+ this->just_resize(new_rows, new_cols, &old_vals);
|
|
|
7b3626 |
|
|
|
7b3626 |
memcpy((void *)this->p_memory,
|
|
|
7b3626 |
(const void *)old_vals,
|
|
|
7b3626 |
@@ -126,9 +126,9 @@
|
|
|
7b3626 |
int copy_r = Lof(this->num_rows(), new_rows);
|
|
|
7b3626 |
int copy_c = Lof(this->num_columns(), new_cols);
|
|
|
7b3626 |
|
|
|
7b3626 |
- just_resize(new_rows, new_cols, &old_vals);
|
|
|
7b3626 |
+ this->just_resize(new_rows, new_cols, &old_vals);
|
|
|
7b3626 |
|
|
|
7b3626 |
- set_values(old_vals,
|
|
|
7b3626 |
+ this->set_values(old_vals,
|
|
|
7b3626 |
old_row_step, old_column_step,
|
|
|
7b3626 |
0, copy_r,
|
|
|
7b3626 |
0, copy_c);
|
|
|
7b3626 |
--- speech_tools/base_class/EST_TSimpleVector.cc.orig 2012-02-25 12:38:16.647543126 -0600
|
|
|
7b3626 |
+++ speech_tools/base_class/EST_TSimpleVector.cc 2012-02-25 12:38:41.571710862 -0600
|
|
|
7b3626 |
@@ -70,7 +70,7 @@
|
|
|
7b3626 |
T *old_vals =NULL;
|
|
|
7b3626 |
int old_offset = this->p_offset;
|
|
|
7b3626 |
|
|
|
7b3626 |
- just_resize(newn, &old_vals);
|
|
|
7b3626 |
+ this->just_resize(newn, &old_vals);
|
|
|
7b3626 |
|
|
|
7b3626 |
if (set && old_vals)
|
|
|
7b3626 |
{
|