30 lines
924 B
Diff
30 lines
924 B
Diff
|
diff -uNr festival.orig/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc festival/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc
|
||
|
|
--- festival.orig/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc 2012-12-02 23:03:27.000000000 +0000
|
||
|
|
+++ festival/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc 2012-12-02 23:21:17.000000000 +0000
|
||
|
|
@@ -42,6 +42,7 @@
|
||
|
|
|
||
|
|
#include "EST_TSimpleVector.h"
|
||
|
|
#include "EST_matrix_support.h"
|
||
|
|
+#include <cstring>
|
||
|
|
#include <fstream>
|
||
|
|
#include "EST_cutils.h"
|
||
|
|
|
||
|
|
@@ -49,7 +50,7 @@
|
||
|
|
{
|
||
|
|
if (this->p_column_step==1 && a.p_column_step==1)
|
||
|
|
{
|
||
|
|
- resize(a.n(), FALSE);
|
||
|
|
+ this->resize(a.n(), FALSE);
|
||
|
|
memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->n() * sizeof(T));
|
||
|
|
}
|
||
|
|
else
|
||
|
|
@@ -70,7 +71,7 @@
|
||
|
|
int old_offset = this->p_offset;
|
||
|
|
unsigned int q;
|
||
|
|
|
||
|
|
- just_resize(newn, &old_vals);
|
||
|
|
+ this->just_resize(newn, &old_vals);
|
||
|
|
|
||
|
|
if (set && old_vals)
|
||
|
|
{
|