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 #include +#include #include "EST_cutils.h" #include @@ -52,7 +53,7 @@ void EST_TSimpleMatrix::copy_data(const EST_TSimpleMatrix &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 +#include #include "EST_cutils.h" #include @@ -51,7 +52,7 @@ template void EST_TSimpleVector::copy(const EST_TSimpleVector &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 *)this)->copy(a); @@ -141,7 +142,7 @@ template EST_TSimpleVector &EST_TSimpleVector::operator=(const ES template void EST_TSimpleVector::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 *)this)->fill(*this->def_val); }