initial import
This commit is contained in:
51
festival/speech_tools-gcc47.patch
Normal file
51
festival/speech_tools-gcc47.patch
Normal file
@@ -0,0 +1,51 @@
|
||||
diff --git speech_tools.orig/base_class/EST_TSimpleMatrix.cc speech_tools/base_class/EST_TSimpleMatrix.cc
|
||||
index 3a7c47e..7b8ffb1 100644
|
||||
--- speech_tools.orig/base_class/EST_TSimpleMatrix.cc
|
||||
+++ speech_tools/base_class/EST_TSimpleMatrix.cc
|
||||
@@ -44,6 +44,7 @@
|
||||
#include "EST_TVector.h"
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
+#include <cstring>
|
||||
#include "EST_cutils.h"
|
||||
#include <string.h>
|
||||
|
||||
@@ -52,7 +53,7 @@ void EST_TSimpleMatrix<T>::copy_data(const EST_TSimpleMatrix<T> &a)
|
||||
{
|
||||
|
||||
if (!a.p_sub_matrix && !this->p_sub_matrix)
|
||||
- memcpy((void *)&this->a_no_check(0,0),
|
||||
+ std::memcpy((void *)&this->a_no_check(0,0),
|
||||
(const void *)&a.a_no_check(0,0),
|
||||
this->num_rows()*this->num_columns()*sizeof(T)
|
||||
);
|
||||
diff --git speech_tools.orig/base_class/EST_TSimpleVector.cc speech_tools/base_class/EST_TSimpleVector.cc
|
||||
index 5539594..38b313c 100644
|
||||
--- speech_tools.orig/base_class/EST_TSimpleVector.cc
|
||||
+++ speech_tools/base_class/EST_TSimpleVector.cc
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "EST_TSimpleVector.h"
|
||||
#include "EST_matrix_support.h"
|
||||
#include <fstream>
|
||||
+#include <cstring>
|
||||
#include "EST_cutils.h"
|
||||
#include <string.h>
|
||||
|
||||
@@ -51,7 +52,7 @@ template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
|
||||
if (this->p_column_step==1 && a.p_column_step==1)
|
||||
{
|
||||
resize(a.n(), FALSE);
|
||||
- memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->n() * sizeof(T));
|
||||
+ std::memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->n() * sizeof(T));
|
||||
}
|
||||
else
|
||||
((EST_TVector<T> *)this)->copy(a);
|
||||
@@ -141,7 +142,7 @@ template<class T> EST_TSimpleVector<T> &EST_TSimpleVector<T>::operator=(const ES
|
||||
template<class T> void EST_TSimpleVector<T>::zero()
|
||||
{
|
||||
if (this->p_column_step==1)
|
||||
- memset((void *)(this->p_memory), 0, this->n() * sizeof(T));
|
||||
+ std::memset((void *)(this->p_memory), 0, this->n() * sizeof(T));
|
||||
else
|
||||
((EST_TVector<T> *)this)->fill(*this->def_val);
|
||||
}
|
||||
Reference in New Issue
Block a user