Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 75085 Details for
Bug 116030
GCC 4 fixes for app-accessibility/{speech-tools,festival}
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
GCC 4 Fixes for app-accessibility/festival
festival-gcc4.0.diff (text/plain), 33.01 KB, created by
Meethune Bhowmick
on 2005-12-19 04:24:51 UTC
(
hide
)
Description:
GCC 4 Fixes for app-accessibility/festival
Filename:
MIME Type:
Creator:
Meethune Bhowmick
Created:
2005-12-19 04:24:51 UTC
Size:
33.01 KB
patch
obsolete
>diff -upNr festival.orig/src/arch/festival/audspio.cc festival/src/arch/festival/audspio.cc >--- festival.orig/src/arch/festival/audspio.cc 2001-06-04 07:44:20.000000000 -0500 >+++ festival/src/arch/festival/audspio.cc 2005-12-19 05:44:14.799120500 -0600 >@@ -43,6 +43,9 @@ > #include "festival.h" > #include "festivalP.h" > >+using std::cerr; >+using std::endl; >+ > #ifdef NO_SPOOLER > void audsp_play_wave(EST_Wave *w) { cerr << "no spooler available\n"; } > LISP l_audio_mode(LISP mode) { return NIL; } >diff -upNr festival.orig/src/arch/festival/client.cc festival/src/arch/festival/client.cc >--- festival.orig/src/arch/festival/client.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/arch/festival/client.cc 2005-12-19 05:44:15.019134250 -0600 >@@ -49,6 +49,9 @@ > #include "festival.h" > #include "festivalP.h" > >+using std::cerr; >+using std::endl; >+ > static EST_Regex ipnum("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+"); > > int festival_socket_client(const char *host,int port) >diff -upNr festival.orig/src/arch/festival/features.cc festival/src/arch/festival/features.cc >--- festival.orig/src/arch/festival/features.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/arch/festival/features.cc 2005-12-19 05:44:14.639110500 -0600 >@@ -79,6 +79,9 @@ > #include "festival.h" > #include "festivalP.h" > >+using std::cerr; >+using std::endl; >+ > static LISP ff_pref_assoc(const char *name, LISP alist); > > static LISP ff_docstrings = NULL; >diff -upNr festival.orig/src/arch/festival/festival.cc festival/src/arch/festival/festival.cc >--- festival.orig/src/arch/festival/festival.cc 2005-12-19 05:24:41.969823000 -0600 >+++ festival/src/arch/festival/festival.cc 2005-12-19 05:44:14.515102750 -0600 >@@ -46,6 +46,8 @@ > #include "siod.h" > #include "ModuleDescription.h" > >+using namespace std; >+ > static void festival_lisp_funcs(void); > static void festival_lisp_vars(void); > static void festival_banner(void); >diff -upNr festival.orig/src/arch/festival/festivalP.h festival/src/arch/festival/festivalP.h >--- festival.orig/src/arch/festival/festivalP.h 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/arch/festival/festivalP.h 2005-12-19 05:44:15.303152000 -0600 >@@ -50,7 +50,7 @@ void festival_ngram_init(); > void festival_wfst_init(); > void festival_fringe_init(void); > >-extern ostream *cslog; >+extern std::ostream *cslog; > > LISP l_audio_mode(LISP mode); > void audsp_play_wave(EST_Wave *w); >diff -upNr festival.orig/src/arch/festival/ModuleDescription.cc festival/src/arch/festival/ModuleDescription.cc >--- festival.orig/src/arch/festival/ModuleDescription.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/arch/festival/ModuleDescription.cc 2005-12-19 05:44:15.267149750 -0600 >@@ -38,9 +38,10 @@ > /* */ > /*************************************************************************/ > >-#include <iostream.h> >+#include <iostream> > #include "siod.h" > #include "ModuleDescription.h" >+using std::ostream; > > // to make life easier > static inline EST_String S(const char *s) { return EST_String(s); } >diff -upNr festival.orig/src/arch/festival/ngram.cc festival/src/arch/festival/ngram.cc >--- festival.orig/src/arch/festival/ngram.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/arch/festival/ngram.cc 2005-12-19 05:44:15.187144750 -0600 >@@ -40,6 +40,9 @@ > #include "festival.h" > #include "festivalP.h" > >+using std::cout; >+using std::endl; >+ > static LISP ngram_loaded_list = NIL; > static EST_Ngrammar *load_ngram(const EST_String &filename); > static LISP add_ngram(const EST_String &name,EST_Ngrammar *n); >diff -upNr festival.orig/src/arch/festival/Phone.cc festival/src/arch/festival/Phone.cc >--- festival.orig/src/arch/festival/Phone.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/arch/festival/Phone.cc 2005-12-19 05:44:14.559105500 -0600 >@@ -43,6 +43,10 @@ > #include "festival.h" > #include "festivalP.h" > >+using std::cout; >+using std::cerr; >+using std::endl; >+ > static void check_phoneset(void); > static void ps_add_def(const EST_String &name, PhoneSet *ps); > static LISP lisp_select_phoneset(LISP phoneset); >diff -upNr festival.orig/src/arch/festival/server.cc festival/src/arch/festival/server.cc >--- festival.orig/src/arch/festival/server.cc 2003-01-20 06:07:58.000000000 -0600 >+++ festival/src/arch/festival/server.cc 2005-12-19 05:44:14.835122750 -0600 >@@ -54,6 +54,8 @@ > #include "festival.h" > #include "festivalP.h" > >+using namespace std; >+ > #define DEFAULT_MAX_CLIENTS 10 > > /* The folloing gives a server that never forks */ >diff -upNr festival.orig/src/arch/festival/utterance.cc festival/src/arch/festival/utterance.cc >--- festival.orig/src/arch/festival/utterance.cc 2001-04-04 08:12:35.000000000 -0500 >+++ festival/src/arch/festival/utterance.cc 2005-12-19 05:44:14.595107750 -0600 >@@ -42,6 +42,10 @@ > #include "festival.h" > #include "festivalP.h" > >+using std::cout; >+using std::cerr; >+using std::endl; >+ > static LISP item_features(LISP sitem, LISP leval = NIL); > static LISP item_features(EST_Item *s, bool evaluate_ff=false); > static LISP stream_tree_to_lisp(EST_Item *s); >diff -upNr festival.orig/src/arch/festival/wagon_interp.cc festival/src/arch/festival/wagon_interp.cc >--- festival.orig/src/arch/festival/wagon_interp.cc 2003-01-14 12:21:07.000000000 -0600 >+++ festival/src/arch/festival/wagon_interp.cc 2005-12-19 05:44:14.719115500 -0600 >@@ -155,8 +155,8 @@ static int wagon_ask(EST_Item *s, LISP q > return FALSE; > else > { >- cerr << "Decision tree: unknown question operator: \"" << >- str_oper << "\"\n"; >+ std::cerr << "Decision tree: unknown question operator: \"" << >+ str_oper << "\"" << std::endl; > festival_error(); > } > return 0; >diff -upNr festival.orig/src/arch/festival/wave.cc festival/src/arch/festival/wave.cc >--- festival.orig/src/arch/festival/wave.cc 2003-01-13 13:09:55.000000000 -0600 >+++ festival/src/arch/festival/wave.cc 2005-12-19 05:44:14.675112750 -0600 >@@ -47,6 +47,9 @@ > #include "winsock2.h" > #endif > >+using std::cerr; >+using std::endl; >+ > static void utt_save_f0_from_targets(EST_Utterance *u,EST_String &filename); > static float f0_interpolate(EST_Item *ptval, EST_Item *tval, float time); > >diff -upNr festival.orig/src/arch/festival/wfst.cc festival/src/arch/festival/wfst.cc >--- festival.orig/src/arch/festival/wfst.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/arch/festival/wfst.cc 2005-12-19 05:44:15.143142000 -0600 >@@ -40,6 +40,9 @@ > #include "festival.h" > #include "festivalP.h" > >+using std::cout; >+using std::endl; >+ > static LISP wfst_loaded_list = NIL; > static EST_WFST *load_wfst(const EST_String &filename); > static LISP add_wfst(const EST_String &name,EST_WFST *n); >diff -upNr festival.orig/src/include/festival.h festival/src/include/festival.h >--- festival.orig/src/include/festival.h 2001-05-28 17:24:47.000000000 -0500 >+++ festival/src/include/festival.h 2005-12-19 05:44:13.943067000 -0600 >@@ -40,7 +40,7 @@ > #define __FESTIVAL_H__ > > #include <stdlib.h> >-#include <fstream.h> >+#include <fstream> > #include "EST.h" > #include "EST_cutils.h" > #include "siod.h" >@@ -55,7 +55,7 @@ struct ModuleDescription; > > /* An iostream for outputing debug messages, switchable */ > /* to /dev/null or cerr */ >-extern ostream *cdebug; >+extern std::ostream *cdebug; > #define cwarn cout > extern "C" FILE* stddebug; > extern int ft_server_socket; >diff -upNr festival.orig/src/include/lexicon.h festival/src/include/lexicon.h >--- festival.orig/src/include/lexicon.h 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/include/lexicon.h 2005-12-19 05:44:14.063074500 -0600 >@@ -99,12 +99,12 @@ public: > const EST_String &word, > int start,int mid, int end); > >- inline friend ostream& operator<<(ostream& s, Lexicon &p); >+ inline friend std::ostream& operator<<(std::ostream& s, Lexicon &p); > > Lexicon & operator =(const Lexicon &a); > }; > >-inline ostream& operator<<(ostream& s, Lexicon &p) >+inline std::ostream& operator<<(std::ostream& s, Lexicon &p) > { > s << "[LEXICON " << p.lex_name() << "]" ; > return s; >diff -upNr festival.orig/src/include/ModuleDescription.h festival/src/include/ModuleDescription.h >--- festival.orig/src/include/ModuleDescription.h 2001-04-04 08:12:35.000000000 -0500 >+++ festival/src/include/ModuleDescription.h 2005-12-19 05:44:14.355092750 -0600 >@@ -35,7 +35,7 @@ > #define __MODULEDESCRIPTION_H__ > > #include <stdio.h> >-#include <iostream.h> >+#include <iostream> > #include "EST_String.h" > > /** Machine readable descriptions of modules. Useful for help messages >@@ -130,14 +130,14 @@ struct ModuleDescription { > /// Create a module description, initialising it properly. > static struct ModuleDescription *create(); > /// Print the description to the strream. >- static ostream &print(ostream &s, const ModuleDescription &desc); >+ static std::ostream &print(std::ostream &s, const ModuleDescription &desc); > > static int print(FILE *s, const ModuleDescription &desc); > > }; > > /// Output operator for descriptions. >-ostream &operator << (ostream &stream, const ModuleDescription &desc); >+std::ostream &operator << (std::ostream &stream, const ModuleDescription &desc); > > VAL_REGISTER_CLASS_DCLS(moddesc,ModuleDescription) > SIOD_REGISTER_CLASS_DCLS(moddesc,ModuleDescription) >diff -upNr festival.orig/src/include/Phone.h festival/src/include/Phone.h >--- festival.orig/src/include/Phone.h 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/include/Phone.h 2005-12-19 05:44:13.979069250 -0600 >@@ -55,12 +55,12 @@ public: > { return features.val_def(key,def); } > int match_features(Phone *foreign); > >- inline friend ostream& operator<<(ostream& s, Phone &p); >+ inline friend std::ostream& operator<<(std::ostream& s, Phone &p); > > Phone & operator =(const Phone &a); > }; > >-inline ostream& operator<<(ostream& s, Phone &p) >+inline std::ostream& operator<<(std::ostream& s, Phone &p) > { > s << "[PHONE " << p.phone_name() << "]"; > // s << p.features << endl; >@@ -108,13 +108,13 @@ public: > != NIL); } > void set_feature(const EST_String &name, LISP vals); > >- inline friend ostream& operator<<(ostream& s, PhoneSet &p); >+ inline friend std::ostream& operator<<(std::ostream& s, PhoneSet &p); > > Phone *find_matched_phone(Phone *phone); > PhoneSet & operator =(const PhoneSet &a); > }; > >-inline ostream& operator<<(ostream& s, PhoneSet &p) >+inline std::ostream& operator<<(std::ostream& s, PhoneSet &p) > { > s << p.phone_set_name(); return s; > } >diff -upNr festival.orig/src/main/audsp.cc festival/src/main/audsp.cc >--- festival.orig/src/main/audsp.cc 2001-06-04 07:44:56.000000000 -0500 >+++ festival/src/main/audsp.cc 2005-12-19 05:44:21.735554000 -0600 >@@ -48,6 +48,9 @@ > #include "EST.h" > #include "EST_unix.h" > >+using std::cerr; >+using std::endl; >+ > #ifdef NO_SPOOLER > > int main(int argc, char **argv) >diff -upNr festival.orig/src/main/festival_client.cc festival/src/main/festival_client.cc >--- festival.orig/src/main/festival_client.cc 2003-01-13 13:20:56.000000000 -0600 >+++ festival/src/main/festival_client.cc 2005-12-19 05:44:21.739554250 -0600 >@@ -48,6 +48,9 @@ typedef HANDLE SERVER_FD; > typedef FILE *SERVER_FD; > #endif > >+using std::cerr; >+using std::endl; >+ > static void festival_client_main(int argc, char **argv); > static void copy_to_server(FILE *fdin,SERVER_FD serverfd); > static void ttw_file(SERVER_FD serverfd, const EST_String &file); >diff -upNr festival.orig/src/main/festival_main.cc festival/src/main/festival_main.cc >--- festival.orig/src/main/festival_main.cc 2001-04-04 08:12:35.000000000 -0500 >+++ festival/src/main/festival_main.cc 2005-12-19 05:44:21.727553500 -0600 >@@ -218,7 +218,7 @@ static void festival_script_mode(int arg > > if (argc < 2) > { >- cerr << "festival: script_mode has no file to interpret" << endl; >+ std::cerr << "festival: script_mode has no file to interpret" << std::endl; > return; > } > >diff -upNr festival.orig/src/modules/base/ff.cc festival/src/modules/base/ff.cc >--- festival.orig/src/modules/base/ff.cc 2001-04-04 08:12:35.000000000 -0500 >+++ festival/src/modules/base/ff.cc 2005-12-19 05:44:16.075200250 -0600 >@@ -41,6 +41,9 @@ > #include "festival.h" > #include "modules.h" > >+using std::cerr; >+using std::endl; >+ > static EST_String stressname("stress"); > static EST_Val val_string0("0"); > static EST_Val val_string1("1"); >diff -upNr festival.orig/src/modules/base/modules.cc festival/src/modules/base/modules.cc >--- festival.orig/src/modules/base/modules.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/base/modules.cc 2005-12-19 05:44:15.839185500 -0600 >@@ -43,6 +43,9 @@ > #include "modules.h" > #include "intonation.h" > >+using std::cerr; >+using std::endl; >+ > static void create_words(EST_Utterance *u); > static void create_segments(EST_Utterance *u); > static void create_wave(EST_Utterance *u); >diff -upNr festival.orig/src/modules/base/parameters.cc festival/src/modules/base/parameters.cc >--- festival.orig/src/modules/base/parameters.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/base/parameters.cc 2005-12-19 05:44:16.043198250 -0600 >@@ -45,6 +45,8 @@ > // this isn't as efficient as it might be, but we aren't going to be > // doing this inside any loops > >+using std::cerr; >+ > LISP lisp_parameter_get(const EST_String parameter_name) > { > LISP parameter_get = siod_get_lval("Parameter.get", "Parameter.get not defined"); >diff -upNr festival.orig/src/modules/base/phrasify.cc festival/src/modules/base/phrasify.cc >--- festival.orig/src/modules/base/phrasify.cc 2005-12-19 05:24:41.937821000 -0600 >+++ festival/src/modules/base/phrasify.cc 2005-12-19 05:44:16.155205250 -0600 >@@ -41,6 +41,9 @@ > #include "festival.h" > #include "modules.h" > >+using std::cerr; >+using std::endl; >+ > static void phrasing_none(EST_Utterance *u); > static void phrasing_by_cart(EST_Utterance *u); > static void phrasing_by_probmodels(EST_Utterance *u); >@@ -218,7 +221,7 @@ static void phrasing_by_probmodels(EST_U > EST_Val npbreak = wagon_predict(w,phrase_type_tree); > w->set("pbreak",npbreak.string()); // may reset to BB > } >- pbreak = (EST_String)w->f("pbreak"); >+ pbreak = EST_String(w->f("pbreak")); > if (pbreak == "B") > w->set("blevel",3); > else if (pbreak == "mB") >diff -upNr festival.orig/src/modules/base/phrinfo.cc festival/src/modules/base/phrinfo.cc >--- festival.orig/src/modules/base/phrinfo.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/base/phrinfo.cc 2005-12-19 05:44:16.407221000 -0600 >@@ -43,6 +43,9 @@ > #include "modules.h" > #include "text.h" > >+using std::cerr; >+using std::endl; >+ > static EST_Item *make_phrase_node(EST_Utterance *u, > const EST_String &name, > LISP feats); >diff -upNr festival.orig/src/modules/base/pos.cc festival/src/modules/base/pos.cc >--- festival.orig/src/modules/base/pos.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/base/pos.cc 2005-12-19 05:44:16.119203000 -0600 >@@ -41,6 +41,9 @@ > #include "festival.h" > #include "lexicon.h" > >+using std::cerr; >+using std::endl; >+ > static EST_VTCandidate *pos_candlist(EST_Item *s,EST_Features &f); > static EST_VTPath *pos_npath(EST_VTPath *p,EST_VTCandidate *c,EST_Features &f); > static double find_np_prob(EST_VTPath *p,int n,int *state); >diff -upNr festival.orig/src/modules/base/word.cc festival/src/modules/base/word.cc >--- festival.orig/src/modules/base/word.cc 2005-12-19 05:24:41.937821000 -0600 >+++ festival/src/modules/base/word.cc 2005-12-19 05:44:16.199208000 -0600 >@@ -42,6 +42,9 @@ > #include "lexicon.h" > #include "modules.h" > >+using std::cerr; >+using std::endl; >+ > static EST_Item *add_syllable(EST_Utterance *u, int stress); > static LISP specified_word_pronunciation(EST_Item *w, LISP lpos); > >@@ -64,10 +67,10 @@ LISP FT_Classic_Word_Utt(LISP utt) > for (w=u->relation("Word")->first(); w != 0; w = next(w)) > { > lpos = NIL; >- pos = (EST_String)ffeature(w,"hg_pos"); >+ pos = EST_String(ffeature(w,"hg_pos")); > // explicit homograph pos disambiguation > if (pos == "0") >- pos = (EST_String)ffeature(w,"pos"); >+ pos = EST_String(ffeature(w,"pos")); > if (pos != "0") > lpos = rintern(pos); > >@@ -100,8 +103,8 @@ static LISP specified_word_pronunciation > // from which a list can be read. > EST_String p; > >- if (((p = (EST_String)ffeature(w,"phonemes")) != "0") || >- ((p = (EST_String)ffeature(w,"R:Token.parent.phonemes")) != "0")) >+ if (((p = EST_String(ffeature(w,"phonemes"))) != "0") || >+ ((p = EST_String(ffeature(w,"R:Token.parent.phonemes"))) != "0")) > { > LISP phones = read_from_lstring(strintern(p)); > >diff -upNr festival.orig/src/modules/clunits/acost.cc festival/src/modules/clunits/acost.cc >--- festival.orig/src/modules/clunits/acost.cc 2001-08-06 12:34:03.000000000 -0500 >+++ festival/src/modules/clunits/acost.cc 2005-12-19 05:44:19.335404000 -0600 >@@ -49,6 +49,8 @@ > #include "festival.h" > #include "clunits.h" > >+using namespace std; >+ > static void find_unit_distances(LISP units, const EST_String &fname); > > static float duration_penalty_weight=1.0; >diff -upNr festival.orig/src/modules/clunits/cldb.cc festival/src/modules/clunits/cldb.cc >--- festival.orig/src/modules/clunits/cldb.cc 2001-06-10 08:45:22.000000000 -0500 >+++ festival/src/modules/clunits/cldb.cc 2005-12-19 05:44:19.351405000 -0600 >@@ -44,6 +44,8 @@ > #include "EST_FileType.h" > #include "clunits.h" > >+using namespace std; >+ > VAL_REGISTER_CLASS(clunitsdb,CLDB) > SIOD_REGISTER_CLASS(clunitsdb,CLDB) > static void cl_load_catalogue(CLDB *cldb,EST_String &indexfile); >diff -upNr festival.orig/src/modules/clunits/clunits.cc festival/src/modules/clunits/clunits.cc >--- festival.orig/src/modules/clunits/clunits.cc 2002-05-21 06:13:01.000000000 -0500 >+++ festival/src/modules/clunits/clunits.cc 2005-12-19 05:44:19.343404500 -0600 >@@ -78,6 +78,9 @@ > #include "festival.h" > #include "clunits.h" > >+using std::cerr; >+using std::endl; >+ > static void setup_clunits_params(); > static EST_VTCandidate *TS_candlist(EST_Item *s,EST_Features &f); > static EST_VTPath *TS_npath(EST_VTPath *p,EST_VTCandidate *c,EST_Features &f); >diff -upNr festival.orig/src/modules/donovan/donovan.cc festival/src/modules/donovan/donovan.cc >--- festival.orig/src/modules/donovan/donovan.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/donovan/donovan.cc 2005-12-19 05:44:18.347342250 -0600 >@@ -44,11 +44,13 @@ > /* Note the FreeSpeech code is GNU Copyright not like the above */ > /* */ > /*=======================================================================*/ >-#include <iostream.h> >-#include <fstream.h> >+#include <iostream> > #include "festival.h" > #include "donovan.h" > >+using std::cerr; >+using std::endl; >+ > static CONFIG *make_config(void); > static void delete_config(CONFIG *config); > static SPN *make_spn(EST_Utterance &u); >@@ -111,7 +113,7 @@ LISP FT_Donovan_Synthesize_Utt(LISP utt) > > if (nindex == 0) > { >- cerr << "Festival: no donovan diphones loaded\n"; >+ cerr << "Festival: no donovan diphones loaded" << endl; > festival_error(); > } > >@@ -307,7 +309,7 @@ void as_realloc(int nframes, int npp, AC > (void)npp; > (void)as; > >- cerr << "Donovan diphones: as_realloc called unexpectedly\n"; >+ cerr << "Donovan diphones: as_realloc called unexpectedly" << endl; > festival_error(); > > } >diff -upNr festival.orig/src/modules/Duration/duration.cc festival/src/modules/Duration/duration.cc >--- festival.orig/src/modules/Duration/duration.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/Duration/duration.cc 2005-12-19 05:44:16.519228000 -0600 >@@ -41,6 +41,8 @@ > #include "festival.h" > #include "durationP.h" > >+using namespace std; >+ > LISP FT_Duration_Ave_Utt(LISP utt) > { > // Predict average duration on segments >diff -upNr festival.orig/src/modules/Duration/dur_aux.cc festival/src/modules/Duration/dur_aux.cc >--- festival.orig/src/modules/Duration/dur_aux.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/Duration/dur_aux.cc 2005-12-19 05:44:16.483225750 -0600 >@@ -41,6 +41,8 @@ > #include "festival.h" > #include "durationP.h" > >+using std::cerr; >+ > float dur_get_stretch(void) > { > LISP lstretch = ft_get_param("Duration_Stretch"); >diff -upNr festival.orig/src/modules/Duration/Klatt.cc festival/src/modules/Duration/Klatt.cc >--- festival.orig/src/modules/Duration/Klatt.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/Duration/Klatt.cc 2005-12-19 05:44:16.559230500 -0600 >@@ -56,6 +56,10 @@ which I think is neater. > #include "festival.h" > #include "durationP.h" > >+using std::cout; >+using std::cerr; >+using std::endl; >+ > static void klatt_dur_debug(EST_Item *s); > > static float rule2(EST_Item *seg); >diff -upNr festival.orig/src/modules/Intonation/duffint.cc festival/src/modules/Intonation/duffint.cc >--- festival.orig/src/modules/Intonation/duffint.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/Intonation/duffint.cc 2005-12-19 05:44:16.731241250 -0600 >@@ -41,6 +41,9 @@ > #include "festival.h" > #include "intonation.h" > >+using std::cout; >+using std::endl; >+ > LISP FT_Intonation_Default_Utt(LISP utt) > { > return utt; >diff -upNr festival.orig/src/modules/Intonation/gen_int.cc festival/src/modules/Intonation/gen_int.cc >--- festival.orig/src/modules/Intonation/gen_int.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/Intonation/gen_int.cc 2005-12-19 05:44:16.819246750 -0600 >@@ -49,6 +49,9 @@ > #include "festival.h" > #include "intonation.h" > >+using std::cerr; >+using std::endl; >+ > static void check_targs(EST_Utterance *u); > static EST_Item *find_nearest_seg(EST_Utterance *u,float pos); > >diff -upNr festival.orig/src/modules/Intonation/int_tree.cc festival/src/modules/Intonation/int_tree.cc >--- festival.orig/src/modules/Intonation/int_tree.cc 2005-12-19 05:24:41.941821000 -0600 >+++ festival/src/modules/Intonation/int_tree.cc 2005-12-19 05:44:16.859249250 -0600 >@@ -47,6 +47,9 @@ > #include "festival.h" > #include "intonation.h" > >+using std::cerr; >+using std::endl; >+ > enum lr_tpos {tp_start, tp_mid, tp_end}; > > static EST_String accent_specified(EST_Item *s); >@@ -87,11 +90,11 @@ LISP FT_Intonation_Tree_Utt(LISP utt) > for (s=u->relation("Syllable")->first(); s != 0; s=next(s)) > { > if ((paccent = accent_specified(s)) == "0") // check if pre-specified >- paccent = (EST_String)wagon_predict(s,accent_tree); >+ paccent = EST_String(wagon_predict(s,accent_tree)); > if (paccent != "NONE") > add_IntEvent(u,s,paccent); > if ((ptone = tone_specified(s)) == "0") >- ptone = (EST_String)wagon_predict(s,endtone_tree); >+ ptone = EST_String(wagon_predict(s,endtone_tree)); > if (ptone != "NONE") > add_IntEvent(u,s,ptone); > } >@@ -107,11 +110,11 @@ static EST_String accent_specified(EST_I > EST_Item *token = parent(word,"Token"); > EST_String paccent("0"); > if (token) >- paccent = (EST_String)ffeature(token,"accent"); >+ paccent = EST_String(ffeature(token,"accent")); > > if (paccent == "0") > { >- paccent = (EST_String)ffeature(word,"accent"); >+ paccent = EST_String(ffeature(word,"accent")); > if (paccent == "0") > return paccent; > } >@@ -139,11 +142,11 @@ static EST_String tone_specified(EST_Ite > EST_Item *token = parent(word,"Token"); > EST_String ptone("0"); > if (token) >- ptone = (EST_String)ffeature(token,"tone"); >+ ptone = EST_String(ffeature(token,"tone")); > > if (ptone == "0") > { >- ptone = (EST_String)ffeature(word,"tone"); >+ ptone = EST_String(ffeature(word,"tone")); > if (ptone == "0") > return ptone; > } >@@ -272,7 +275,7 @@ static void add_target_at(EST_Utterance > add_target(u,seg,seg->F("end"),val); > else > { >- cerr << "add_target_at: unknown position type\n"; >+ cerr << "add_target_at: unknown position type" << endl; > festival_error(); > } > } >diff -upNr festival.orig/src/modules/Intonation/simple.cc festival/src/modules/Intonation/simple.cc >--- festival.orig/src/modules/Intonation/simple.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/Intonation/simple.cc 2005-12-19 05:44:16.775244000 -0600 >@@ -52,7 +52,7 @@ LISP FT_Intonation_Simple_Utt(LISP utt) > LISP accent_tree; > EST_Val paccent; > >- *cdebug << "Simple intonation module" << endl; >+ *cdebug << "Simple intonation module" << std::endl; > > accent_tree = siod_get_lval("int_accent_cart_tree","no accent tree"); > >@@ -80,7 +80,7 @@ LISP FT_Int_Targets_Simple_Utt(LISP utt) > LISP simple_params; > float f0_mean, f0_std; > >- *cdebug << "Simple int targets module" << endl; >+ *cdebug << "Simple int targets module" << std::endl; > > // Create some down step accents > simple_params = siod_get_lval("int_simple_params","no simple params"); >diff -upNr festival.orig/src/modules/Lexicon/complex.cc festival/src/modules/Lexicon/complex.cc >--- festival.orig/src/modules/Lexicon/complex.cc 2001-04-04 08:12:35.000000000 -0500 >+++ festival/src/modules/Lexicon/complex.cc 2005-12-19 05:44:15.635172750 -0600 >@@ -44,6 +44,8 @@ > #include "lexiconP.h" > #include "lts.h" > >+using namespace std; >+ > static LISP check_and_fix(LISP entry); > static void check_sylphones(const char *name,LISP syls); > >diff -upNr festival.orig/src/modules/Lexicon/lexicon.cc festival/src/modules/Lexicon/lexicon.cc >--- festival.orig/src/modules/Lexicon/lexicon.cc 2002-01-29 06:47:03.000000000 -0600 >+++ festival/src/modules/Lexicon/lexicon.cc 2005-12-19 05:44:15.507164750 -0600 >@@ -43,6 +43,10 @@ > #include "lexiconP.h" > #include "lts.h" > >+using std::cout; >+using std::cerr; >+using std::endl; >+ > static int bl_match_entry(LISP entry,const EST_String &word); > static int match_features(LISP req_feats, LISP act_feats); > >diff -upNr festival.orig/src/modules/Lexicon/lts_rules.cc festival/src/modules/Lexicon/lts_rules.cc >--- festival.orig/src/modules/Lexicon/lts_rules.cc 2003-01-09 09:43:28.000000000 -0600 >+++ festival/src/modules/Lexicon/lts_rules.cc 2005-12-19 05:44:15.595170250 -0600 >@@ -58,6 +58,8 @@ > #include "festival.h" > #include "lts.h" > >+using namespace std; >+ > class LTS_Ruleset{ > private: > EST_String p_name; >diff -upNr festival.orig/src/modules/rxp/ttsxml.cc festival/src/modules/rxp/ttsxml.cc >--- festival.orig/src/modules/rxp/ttsxml.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/rxp/ttsxml.cc 2005-12-19 05:44:21.207521000 -0600 >@@ -46,6 +46,9 @@ > #include "text.h" > #include "rxp.h" > >+using std::cerr; >+using std::endl; >+ > // So we can share the known_ids table. > #include "ling_class/EST_utterance_xml.h" > >diff -upNr festival.orig/src/modules/Text/text.cc festival/src/modules/Text/text.cc >--- festival.orig/src/modules/Text/text.cc 2001-05-14 16:55:42.000000000 -0500 >+++ festival/src/modules/Text/text.cc 2005-12-19 05:44:17.147267250 -0600 >@@ -49,6 +49,9 @@ > #include "festival.h" > #include "text.h" > >+using std::cerr; >+using std::endl; >+ > static void tts_raw_token(EST_Item *t); > static void tts_raw_utt(LISP utt); > >diff -upNr festival.orig/src/modules/Text/text_modes.cc festival/src/modules/Text/text_modes.cc >--- festival.orig/src/modules/Text/text_modes.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/Text/text_modes.cc 2005-12-19 05:44:17.315277750 -0600 >@@ -52,6 +52,9 @@ > #include "text.h" > #include "lexicon.h" > >+using std::cerr; >+using std::endl; >+ > static void um_apply_filter(const EST_String &filtername, > const EST_String &infile, > const EST_String &outname); >diff -upNr festival.orig/src/modules/Text/token.cc festival/src/modules/Text/token.cc >--- festival.orig/src/modules/Text/token.cc 2005-12-19 05:24:41.941821000 -0600 >+++ festival/src/modules/Text/token.cc 2005-12-19 05:44:17.103264500 -0600 >@@ -84,7 +84,7 @@ LISP FT_Welsh_Token_Utt(LISP utt) > LISP FT_Spanish_Token_Utt(LISP utt) > { > (void)utt; >- cerr << "TOKEN: Spanish tokenization not yet supported\n"; >+ std::cerr << "TOKEN: Spanish tokenization not yet supported" << std::endl; > festival_error(); > > // never happens >@@ -136,7 +136,7 @@ LISP FT_English_Token_Utt(LISP utt) > LISP words,w,eou_tree,l; > EST_Item *new_word; > >- *cdebug << "Token module (English)" << endl; >+ *cdebug << "Token module (English)" << std::endl; > > eou_tree = siod_get_lval("eou_tree","No end of utterance tree"); > user_token_to_word_func = siod_get_lval("token_to_words",NULL); >@@ -230,7 +230,7 @@ static LISP builtin_word_it(EST_Item *to > else > return cons(strintern(tok),NIL); > } >- else if ((token_pos = (EST_String)ffeature(token,"token_pos")) == "ordinal") >+ else if ((token_pos = EST_String(ffeature(token,"token_pos"))) == "ordinal") > return say_num_as_ordinal(tok); > else if (token_pos == "year") > return say_num_as_year(tok); >@@ -471,7 +471,7 @@ static LISP say_num_as_ordinal(const EST > { > // I don't think I've forgotten anything > *cdebug << "Token: can't make ordinal from \"" << lastword >- << "\"" << endl; >+ << "\"" << std::endl; > CAR(last) = strintern(EST_String(lastword)+"th"); > } > >diff -upNr festival.orig/src/modules/Text/tok_ext.cc festival/src/modules/Text/tok_ext.cc >--- festival.orig/src/modules/Text/tok_ext.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/Text/tok_ext.cc 2005-12-19 05:44:17.187269750 -0600 >@@ -48,6 +48,9 @@ > #include "lexicon.h" > #include "text.h" > >+using std::cerr; >+using std::endl; >+ > static int rhc = 10; > static int lhc = 10; > >diff -upNr festival.orig/src/modules/Text/xxml.cc festival/src/modules/Text/xxml.cc >--- festival.orig/src/modules/Text/xxml.cc 2005-12-19 05:24:41.941821000 -0600 >+++ festival/src/modules/Text/xxml.cc 2005-12-19 05:44:17.279275500 -0600 >@@ -48,6 +48,9 @@ > #include "text.h" > #include "lexicon.h" > >+using std::cerr; >+using std::endl; >+ > static LISP xxml_get_attribute(const EST_String &remainder); > static char *xxml_process_line(const char *line); > static void tts_xxml_token(EST_Item *t); >@@ -93,7 +96,7 @@ void tts_file_xxml(LISP filename) > cerr << "xxml parse error: unexpected end of file \n"; > festival_error(); > } >- line = (EST_String)ts.get_upto_eoln(); >+ line = EST_String(ts.get_upto_eoln()); > type = line.at(0,1); > remainder = line.after(0); > if (type == "-") >@@ -159,7 +162,7 @@ static LISP xxml_get_attribute(const EST > EST_Token t; > > ts.open_string(remainder); >- name = (EST_String)ts.get(); >+ name = EST_String(ts.get()); > if ((t=ts.get()) == "IMPLIED") > att = cons(rintern(name),cons(NIL,NIL)); > else if (t == "TOKEN") >diff -upNr festival.orig/src/modules/UniSyn/us_features.cc festival/src/modules/UniSyn/us_features.cc >--- festival.orig/src/modules/UniSyn/us_features.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/UniSyn/us_features.cc 2005-12-19 05:44:17.775306500 -0600 >@@ -43,6 +43,9 @@ > #include "EST_error.h" > #include "us_features.h" > >+using std::cerr; >+using std::endl; >+ > void add_feature_function(EST_Relation &r, const EST_String &fname, > const EST_String &funcname) > { >diff -upNr festival.orig/src/modules/UniSyn_diphone/UniSyn_diphone.cc festival/src/modules/UniSyn_diphone/UniSyn_diphone.cc >--- festival.orig/src/modules/UniSyn_diphone/UniSyn_diphone.cc 2001-04-04 06:55:20.000000000 -0500 >+++ festival/src/modules/UniSyn_diphone/UniSyn_diphone.cc 2005-12-19 05:44:18.719365500 -0600 >@@ -42,6 +42,8 @@ > #include "us_diphone.h" > #include "festival.h" > >+using std::endl; >+ > extern USDiphIndex *diph_index; > LISP us_dbs = NIL; > LISP us_make_group_file(LISP lname, LISP params); >@@ -114,7 +116,7 @@ LISP us_diphone_init(LISP args) > d_index->grouped = true; > if (d_index->ts.open(d_index->index_file) != 0) > { >- cerr << "US DB: can't open grouped diphone file " >+ std::cerr << "US DB: can't open grouped diphone file " > << d_index->index_file << endl; > festival_error(); > } >@@ -123,10 +125,10 @@ LISP us_diphone_init(LISP args) > } > else > { >- *cdebug << ":" << get_param_str("grouped",args,"") << ":" << endl; >- *cdebug << "index grouped:" << d_index->grouped << endl; >- *cdebug << "true:" << true << endl; >- *cdebug << "false:" << false << endl; >+ *cdebug << ":" << get_param_str("grouped",args,"") << ":" << endl >+ << "index grouped:" << d_index->grouped << endl >+ << "true:" << true << endl >+ << "false:" << false << endl; > > d_index->coef_dir = get_param_str("coef_dir",args,""); > d_index->sig_dir = get_param_str("sig_dir",args,""); >diff -upNr festival.orig/src/modules/UniSyn_diphone/us_diphone_index.cc festival/src/modules/UniSyn_diphone/us_diphone_index.cc >--- festival.orig/src/modules/UniSyn_diphone/us_diphone_index.cc 2005-12-19 05:24:41.945821000 -0600 >+++ festival/src/modules/UniSyn_diphone/us_diphone_index.cc 2005-12-19 05:44:18.799370500 -0600 >@@ -43,6 +43,10 @@ > #include "us_diphone.h" > #include "Phone.h" > >+using std::cout; >+using std::cerr; >+using std::endl; >+ > static bool US_full_coefs = false; > USDiphIndex *diph_index = 0; > extern LISP us_dbs; >@@ -106,9 +110,9 @@ static EST_String get_diphone_name(EST_I > > if (!item) > return ""; >- else if ((d1 = (EST_String)item->f(dname+"_"+dir,def)) != "0") >+ else if ((d1 = EST_String(item->f(dname+"_"+dir,def))) != "0") > return d1; >- else if ((d1 = (EST_String)item->f(dname,def)) != "0") >+ else if ((d1 = EST_String(item->f(dname,def))) != "0") > return d1; > else > return item->f("name","0").string(); >diff -upNr festival.orig/src/modules/UniSyn_diphone/us_diphone_unit.cc festival/src/modules/UniSyn_diphone/us_diphone_unit.cc >--- festival.orig/src/modules/UniSyn_diphone/us_diphone_unit.cc 2001-04-04 08:12:35.000000000 -0500 >+++ festival/src/modules/UniSyn_diphone/us_diphone_unit.cc 2005-12-19 05:44:18.763368250 -0600 >@@ -43,6 +43,9 @@ > #include "us_diphone.h" > #include "Phone.h" > >+using std::cerr; >+using std::endl; >+ > extern USDiphIndex *diph_index; > > void dur_to_end(EST_Relation &r)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 116030
:
75084
| 75085 |
75086
|
75087
|
75088
|
82632
|
82633
|
87873
|
88397
|
90230
|
90266
|
92360
|
93452
|
93453
|
93454
|
93455
|
93456
|
96369