This patch is part of a series of patches for speech-tools for Debian GNU/Linux, which primarily fix build errors with GCC 4.3 and newer. --- speech-tools-1.2.3.orig/include/instantiate/EST_TVectorI.h +++ speech-tools-1.2.3/include/instantiate/EST_TVectorI.h @@ -62,22 +62,22 @@ static TYPE const TAG##_vec_def_val_s; \ static TYPE TAG##_vec_error_return_s; \ \ - TYPE const *EST_TVector< TYPE >::def_val=&TAG##_vec_def_val_s; \ - TYPE *EST_TVector< TYPE >::error_return=&TAG##_vec_error_return_s; + template <> TYPE const *EST_TVector< TYPE >::def_val=&TAG##_vec_def_val_s; \ + template <> TYPE *EST_TVector< TYPE >::error_return=&TAG##_vec_error_return_s; #define Declare_TVector_Base_T(TYPE,DEFAULT,ERROR,TAG) \ static TYPE const TAG##_vec_def_val_s=DEFAULT; \ static TYPE TAG##_vec_error_return_s=ERROR; \ \ - TYPE const *EST_TVector::def_val=&TAG##_vec_def_val_s; \ - TYPE *EST_TVector::error_return=&TAG##_vec_error_return_s; + template <> TYPE const *EST_TVector::def_val=&TAG##_vec_def_val_s; \ + template <> TYPE *EST_TVector::error_return=&TAG##_vec_error_return_s; #define Declare_TVector_Class_T(TYPE,DEFAULT,ERROR,TAG) \ static TYPE const TAG##_vec_def_val_s(DEFAULT); \ static TYPE TAG##_vec_error_return_s(ERROR); \ \ - TYPE const *EST_TVector::def_val=&TAG##_vec_def_val_s; \ - TYPE *EST_TVector::error_return=&TAG##_vec_error_return_s; + template <> TYPE const *EST_TVector::def_val=&TAG##_vec_def_val_s; \ + template <> TYPE *EST_TVector::error_return=&TAG##_vec_error_return_s; #define Declare_TVector(TYPE) Declare_TVector_T(TYPE,TYPE) #define Declare_TVector_Base(TYPE,DEFAULT,ERROR) Declare_TVector_Base_T(TYPE,DEFAULT,ERROR,TYPE)