--- festival/src/include/festival.h.bero 2002-06-10 16:24:59.000000000 +0200
+++ festival/src/include/festival.h 2002-06-10 16:26:06.000000000 +0200
@@ -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 @@
/* 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;
--- festival/src/include/Phone.h.bero 2002-06-10 16:25:25.000000000 +0200
+++ festival/src/include/Phone.h 2002-06-10 16:25:48.000000000 +0200
@@ -55,12 +55,12 @@
{ 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 @@
!= 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;
}
--- festival/src/include/ModuleDescription.h.bero 2002-06-10 16:27:37.000000000 +0200
+++ festival/src/include/ModuleDescription.h 2002-06-10 16:28:14.000000000 +0200
@@ -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 @@
/// 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)
--- festival/src/include/lexicon.h.bero 2002-06-10 16:34:59.000000000 +0200
+++ festival/src/include/lexicon.h 2002-06-10 16:35:10.000000000 +0200
@@ -99,12 +99,12 @@
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;
--- festival/src/arch/festival/festivalP.h.bero 2002-06-10 16:26:28.000000000 +0200
+++ festival/src/arch/festival/festivalP.h 2002-06-10 16:26:34.000000000 +0200
@@ -50,7 +50,7 @@
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);
--- festival/src/arch/festival/festival.cc.bero 2002-06-10 16:26:54.000000000 +0200
+++ festival/src/arch/festival/festival.cc 2002-06-10 16:28:35.000000000 +0200
@@ -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);
--- festival/src/arch/festival/Phone.cc.bero 2002-06-10 16:29:24.000000000 +0200
+++ festival/src/arch/festival/Phone.cc 2002-06-10 16:29:34.000000000 +0200
@@ -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);
--- festival/src/arch/festival/utterance.cc.bero 2002-06-10 16:29:54.000000000 +0200
+++ festival/src/arch/festival/utterance.cc 2002-06-10 16:30:03.000000000 +0200
@@ -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);
--- festival/src/arch/festival/features.cc.bero 2002-06-10 16:30:22.000000000 +0200
+++ festival/src/arch/festival/features.cc 2002-06-10 16:30:31.000000000 +0200
@@ -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;
--- festival/src/arch/festival/wave.cc.bero 2002-06-10 16:30:48.000000000 +0200
+++ festival/src/arch/festival/wave.cc 2002-06-10 16:31:00.000000000 +0200
@@ -43,6 +43,9 @@
#include "festival.h"
#include "festivalP.h"
+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);
--- festival/src/arch/festival/wagon_interp.cc.bero 2002-06-10 16:31:18.000000000 +0200
+++ festival/src/arch/festival/wagon_interp.cc 2002-06-10 16:31:31.000000000 +0200
@@ -150,8 +150,8 @@
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;
--- festival/src/arch/festival/audspio.cc.bero 2002-06-10 16:31:51.000000000 +0200
+++ festival/src/arch/festival/audspio.cc 2002-06-10 16:32:00.000000000 +0200
@@ -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; }
--- festival/src/arch/festival/server.cc.bero 2002-06-10 16:32:22.000000000 +0200
+++ festival/src/arch/festival/server.cc 2002-06-10 16:32:43.000000000 +0200
@@ -54,6 +54,8 @@
#include "festival.h"
#include "festivalP.h"
+using namespace std;
+
#define DEFAULT_MAX_CLIENTS 10
/* If you uncomment the folloing you'll get a server that never forks */
/* and only accepts one client at a time. This is probabaly good for */
--- festival/src/arch/festival/client.cc.bero 2002-06-10 16:33:02.000000000 +0200
+++ festival/src/arch/festival/client.cc 2002-06-10 16:33:10.000000000 +0200
@@ -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)
--- festival/src/arch/festival/wfst.cc.bero 2002-06-10 16:33:49.000000000 +0200
+++ festival/src/arch/festival/wfst.cc 2002-06-10 16:33:57.000000000 +0200
@@ -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);
--- festival/src/arch/festival/ngram.cc.bero 2002-06-10 16:34:24.000000000 +0200
+++ festival/src/arch/festival/ngram.cc 2002-06-10 16:34:33.000000000 +0200
@@ -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);
--- festival/src/arch/festival/ModuleDescription.cc.bero 2002-06-10 16:35:39.000000000 +0200
+++ festival/src/arch/festival/ModuleDescription.cc 2002-06-10 16:36:26.000000000 +0200
@@ -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); }
--- festival/src/modules/Lexicon/lexicon.cc.bero 2002-06-10 16:41:56.000000000 +0200
+++ festival/src/modules/Lexicon/lexicon.cc 2002-06-10 16:42:09.000000000 +0200
@@ -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);
--- festival/src/modules/Lexicon/lts_rules.cc.bero 2002-06-10 16:43:07.000000000 +0200
+++ festival/src/modules/Lexicon/lts_rules.cc 2002-06-10 16:43:17.000000000 +0200
@@ -58,6 +58,8 @@
#include "festival.h"
#include "lts.h"
+using namespace std;
+
class LTS_Ruleset{
private:
EST_String p_name;
--- festival/src/modules/Lexicon/complex.cc.bero 2002-06-10 16:43:49.000000000 +0200
+++ festival/src/modules/Lexicon/complex.cc 2002-06-10 16:43:58.000000000 +0200
@@ -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);
--- festival/src/modules/base/modules.cc.bero 2002-06-10 16:44:40.000000000 +0200
+++ festival/src/modules/base/modules.cc 2002-06-10 16:44:48.000000000 +0200
@@ -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);
--- festival/src/modules/base/parameters.cc.bero 2002-06-10 16:45:21.000000000 +0200
+++ festival/src/modules/base/parameters.cc 2002-06-10 16:45:29.000000000 +0200
@@ -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");
--- festival/src/modules/base/ff.cc.bero 2002-06-10 16:45:45.000000000 +0200
+++ festival/src/modules/base/ff.cc 2002-06-10 16:45:54.000000000 +0200
@@ -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");
--- festival/src/modules/base/pos.cc.bero 2002-06-10 16:48:26.000000000 +0200
+++ festival/src/modules/base/pos.cc 2002-06-10 16:48:35.000000000 +0200
@@ -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);
--- festival/src/modules/base/phrasify.cc.bero 2002-06-10 16:49:43.000000000 +0200
+++ festival/src/modules/base/phrasify.cc 2002-06-10 16:49:52.000000000 +0200
@@ -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);
--- festival/src/modules/base/word.cc.bero 2002-06-10 16:50:10.000000000 +0200
+++ festival/src/modules/base/word.cc 2002-06-10 16:50:20.000000000 +0200
@@ -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);
--- festival/src/modules/base/phrinfo.cc.bero 2002-06-10 16:50:42.000000000 +0200
+++ festival/src/modules/base/phrinfo.cc 2002-06-10 16:50:49.000000000 +0200
@@ -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);
--- festival/src/modules/Duration/dur_aux.cc.bero 2002-06-10 16:51:43.000000000 +0200
+++ festival/src/modules/Duration/dur_aux.cc 2002-06-10 16:51:50.000000000 +0200
@@ -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");
--- festival/src/modules/Duration/duration.cc.bero 2002-06-10 16:52:17.000000000 +0200
+++ festival/src/modules/Duration/duration.cc 2002-06-10 16:52:26.000000000 +0200
@@ -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
--- festival/src/modules/Duration/Klatt.cc.bero 2002-06-10 16:53:14.000000000 +0200
+++ festival/src/modules/Duration/Klatt.cc 2002-06-10 16:53:27.000000000 +0200
@@ -56,6 +56,10 @@
#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);
--- festival/src/modules/Intonation/duffint.cc.bero 2002-06-10 16:54:01.000000000 +0200
+++ festival/src/modules/Intonation/duffint.cc 2002-06-10 16:54:09.000000000 +0200
@@ -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;
--- festival/src/modules/Intonation/simple.cc.bero 2002-06-10 16:54:29.000000000 +0200
+++ festival/src/modules/Intonation/simple.cc 2002-06-10 16:54:39.000000000 +0200
@@ -52,7 +52,7 @@
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 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");
--- festival/src/modules/Intonation/gen_int.cc.bero 2002-06-10 16:55:48.000000000 +0200
+++ festival/src/modules/Intonation/gen_int.cc 2002-06-10 16:56:01.000000000 +0200
@@ -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);
--- festival/src/modules/Intonation/int_tree.cc.bero 2002-06-10 16:56:26.000000000 +0200
+++ festival/src/modules/Intonation/int_tree.cc 2002-06-10 16:56:44.000000000 +0200
@@ -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);
@@ -272,7 +275,7 @@
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();
}
}
--- festival/src/modules/Text/token.cc.bero 2002-06-10 16:57:13.000000000 +0200
+++ festival/src/modules/Text/token.cc 2002-06-10 16:57:58.000000000 +0200
@@ -84,7 +84,7 @@
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 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);
@@ -471,7 +471,7 @@
{
// 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");
}
--- festival/src/modules/Text/text.cc.bero 2002-06-10 17:00:25.000000000 +0200
+++ festival/src/modules/Text/text.cc 2002-06-10 17:00:37.000000000 +0200
@@ -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);
--- festival/src/modules/Text/tok_ext.cc.bero 2002-06-10 17:00:55.000000000 +0200
+++ festival/src/modules/Text/tok_ext.cc 2002-06-10 17:01:07.000000000 +0200
@@ -48,6 +48,9 @@
#include "lexicon.h"
#include "text.h"
+using std::cerr;
+using std::endl;
+
static int rhc = 10;
static int lhc = 10;
--- festival/src/modules/Text/xxml.cc.bero 2002-06-10 17:01:38.000000000 +0200
+++ festival/src/modules/Text/xxml.cc 2002-06-10 17:01:50.000000000 +0200
@@ -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);
--- festival/src/modules/Text/text_modes.cc.bero 2002-06-10 17:02:19.000000000 +0200
+++ festival/src/modules/Text/text_modes.cc 2002-06-10 17:02:28.000000000 +0200
@@ -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);
--- festival/src/modules/UniSyn/us_features.cc.bero 2002-06-10 17:03:17.000000000 +0200
+++ festival/src/modules/UniSyn/us_features.cc 2002-06-10 17:03:30.000000000 +0200
@@ -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)
{
--- festival/src/modules/donovan/donovan.cc.bero 2002-06-10 17:03:51.000000000 +0200
+++ festival/src/modules/donovan/donovan.cc 2002-06-10 17:05:16.000000000 +0200
@@ -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 @@
if (nindex == 0)
{
- cerr << "Festival: no donovan diphones loaded\n";
+ cerr << "Festival: no donovan diphones loaded" << endl;
festival_error();
}
@@ -307,7 +309,7 @@
(void)npp;
(void)as;
- cerr << "Donovan diphones: as_realloc called unexpectedly\n";
+ cerr << "Donovan diphones: as_realloc called unexpectedly" << endl;
festival_error();
}
--- festival/src/modules/UniSyn_diphone/UniSyn_diphone.cc.bero 2002-06-10 17:05:24.000000000 +0200
+++ festival/src/modules/UniSyn_diphone/UniSyn_diphone.cc 2002-06-10 17:05:57.000000000 +0200
@@ -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 @@
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 @@
}
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,"");
--- festival/src/modules/UniSyn_diphone/us_diphone_unit.cc.bero 2002-06-10 17:06:23.000000000 +0200
+++ festival/src/modules/UniSyn_diphone/us_diphone_unit.cc 2002-06-10 17:06:34.000000000 +0200
@@ -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)
--- festival/src/modules/UniSyn_diphone/us_diphone_index.cc.bero 2002-06-10 17:06:58.000000000 +0200
+++ festival/src/modules/UniSyn_diphone/us_diphone_index.cc 2002-06-10 17:07:09.000000000 +0200
@@ -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;
--- festival/src/modules/clunits/acost.cc.bero 2002-06-10 16:38:14.000000000 +0200
+++ festival/src/modules/clunits/acost.cc 2002-06-10 16:38:24.000000000 +0200
@@ -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;
--- festival/src/modules/clunits/clunits.cc.bero 2002-06-10 16:39:06.000000000 +0200
+++ festival/src/modules/clunits/clunits.cc 2002-06-10 16:39:18.000000000 +0200
@@ -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);
--- festival/src/modules/clunits/cldb.cc.bero 2002-06-10 16:40:17.000000000 +0200
+++ festival/src/modules/clunits/cldb.cc 2002-06-10 16:40:30.000000000 +0200
@@ -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);
--- festival/src/modules/rxp/ttsxml.cc.bero 2002-06-10 16:37:33.000000000 +0200
+++ festival/src/modules/rxp/ttsxml.cc 2002-06-10 16:37:42.000000000 +0200
@@ -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"
--- festival/src/main/festival_main.cc.bero 2002-06-10 17:07:43.000000000 +0200
+++ festival/src/main/festival_main.cc 2002-06-10 17:07:50.000000000 +0200
@@ -218,7 +218,7 @@
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;
}
--- festival/src/main/festival_client.cc.bero 2002-06-10 17:08:18.000000000 +0200
+++ festival/src/main/festival_client.cc 2002-06-10 17:08:34.000000000 +0200
@@ -42,6 +42,9 @@
#include "EST_unix.h"
#include "festival.h"
+using std::cerr;
+using std::endl;
+
static void festival_client_main(int argc, char **argv);
static void copy_to_server(FILE *fdin,FILE *serverfd);
static void ttw_file(FILE *serverfd, const EST_String &file);
--- festival/src/main/audsp.cc.bero 2002-06-10 17:09:26.000000000 +0200
+++ festival/src/main/audsp.cc 2002-06-10 17:09:38.000000000 +0200
@@ -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)
--- festival/speech_tools/base_class/inst_tmpl/vector_c_t.cc.bero 2002-08-14 23:43:53.000000000 +0200
+++ festival/speech_tools/base_class/inst_tmpl/vector_c_t.cc 2002-08-14 23:45:33.000000000 +0200
@@ -44,7 +44,9 @@
Declare_TSimpleVector(char)
#if defined(INSTANTIATE_TEMPLATES)
-template void std::__pad<char, std::char_traits<char> >(std::ios_base&, char, char*, char const*, int, int, bool);
+namespace std {
+ template void __pad<char, std::char_traits<char> >::_S_pad(std::ios_base&, char, char*, char const*, int, int, bool);
+}
#include "../base_class/EST_TSimpleVector.cc"
#include "../base_class/EST_TVector.cc"
#include "../base_class/EST_Tvectlist.cc"
