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/EST_TNamedEnum.h +++ speech-tools-1.2.3/include/EST_TNamedEnum.h @@ -124,9 +124,9 @@ public: EST_TNamedEnumI(EST_TValuedEnumDefinition defs[]) - {initialise((const void *)defs); }; + {this->initialise((const void *)defs); }; EST_TNamedEnumI(EST_TValuedEnumDefinition defs[], ENUM (*conv)(const char *)) - {initialise((const void *)defs, conv); }; + {this->initialise((const void *)defs, conv); }; const char *name(ENUM tok, int n=0) const {return value(tok,n); }; }; @@ -136,9 +136,9 @@ template class EST_TValuedEnum : public EST_TValuedEnumI { public: EST_TValuedEnum(EST_TValuedEnumDefinition defs[]) - {initialise((const void *)defs);}; + {this->initialise((const void *)defs);}; EST_TValuedEnum(EST_TValuedEnumDefinition defs[], ENUM (*conv)(const char *)) - {initialise((const void *)defs, conv);}; + {this->initialise((const void *)defs, conv);}; }; @@ -148,11 +148,11 @@ EST_write_status priv_save(EST_String name, EST_TNamedEnum *definitive, char quote) const; public: EST_TNamedEnum(ENUM undef_e, const char *undef_n = NULL) - {initialise(undef_e, undef_n);}; + {this->initialise(undef_e, undef_n);}; EST_TNamedEnum(EST_TValuedEnumDefinition defs[]) - {initialise((const void *)defs);}; + {this->initialise((const void *)defs);}; EST_TNamedEnum(EST_TValuedEnumDefinition defs[], ENUM (*conv)(const char *)) - {initialise((const void *)defs, conv);}; + {this->initialise((const void *)defs, conv);}; EST_read_status load(EST_String name) { return priv_load(name, NULL); }; EST_read_status load(EST_String name, EST_TNamedEnum &definitive) { return priv_load(name, &definitive); };