Merge pull request #41 from zeehio/fix-minor-fixes2

Fix: Minor fixes 2 (Add "using namespace" to compilation units)
festvox · Jan 26, 2021 · e2dcb2a · e2dcb2a
2 parents 823252b + 3d1d447
commit e2dcb2a
Show file tree

Hide file tree

Showing 191 changed files with 374 additions and 70 deletions.
diff --git a/audio/gen_audio.cc b/audio/gen_audio.cc
@@ -51,6 +51,8 @@
 #include "EST_audio.h"
 #include "EST_wave_aux.h"
 
+using namespace std;
+
 static int play_sunau_wave(EST_Wave &inwave, EST_Option &al);
 static int play_socket_wave(EST_Wave &inwave, EST_Option &al);
 static int play_aucomm_wave(EST_Wave &inwave, EST_Option &al);

diff --git a/audio/irixaudio.cc b/audio/irixaudio.cc
@@ -17,6 +17,8 @@
 #include "audioP.h"
 #include "EST_io_aux.h"
 
+using namespace std;
+
 #if defined (SUPPORT_IRIX) || defined (SUPPORT_IRIX53)
 #include <audio.h>
 #include <unistd.h>

diff --git a/audio/linux_sound.cc b/audio/linux_sound.cc
@@ -60,6 +60,8 @@
 #include "EST_io_aux.h"
 #include "EST_error.h"
 
+using namespace std;
+
 #ifdef SUPPORT_FREEBSD16
 #include <sys/soundcard.h>
 #include <fcntl.h>

diff --git a/audio/macosxaudio.cc b/audio/macosxaudio.cc
@@ -45,6 +45,8 @@
 #include "EST_Option.h"
 #include "audioP.h"
 
+using namespace std;
+
 #if defined (SUPPORT_MACOSX_AUDIO)
 
 #include <CoreServices/CoreServices.h>

diff --git a/audio/mplayer.cc b/audio/mplayer.cc
@@ -44,6 +44,8 @@
 #include "EST_io_aux.h"
 #include "EST_Pathname.h"
 
+using namespace std;
+
 #ifdef SUPPORT_MPLAYER
 
 int mplayer_supported = TRUE;

diff --git a/audio/nas.cc b/audio/nas.cc
@@ -47,6 +47,9 @@
 #include "audioP.h"
 #include "EST_io_aux.h"
 
+using namespace std;
+
+
 #ifdef SUPPORT_NAS
 #include <audio/audiolib.h>
 #include <audio/soundlib.h>

diff --git a/audio/os2audio.cc b/audio/os2audio.cc
@@ -260,7 +260,7 @@ int play_os2audio_wave(EST_Wave &inwave, EST_Option &al)
 {
     (void)inwave;
     (void)al;
-    cerr << "OS/2 16bit realtime DART playback not supported." << endl;
+    std::cerr << "OS/2 16bit realtime DART playback not supported." << std::endl;
     return -1;
 }
 

diff --git a/audio/sun16audio.cc b/audio/sun16audio.cc
@@ -56,6 +56,8 @@
 #include "EST_io_aux.h"
 #include "EST_unix.h"
 
+using namespace std;
+
 #ifdef SUPPORT_SUN16
 #include <sys/filio.h>
 #if defined(__svr4__) || defined(SYSV) || defined(SVR4)

diff --git a/audio/win32audio.cc b/audio/win32audio.cc
@@ -44,6 +44,8 @@
 #include "EST_io_aux.h"
 #include "EST_Pathname.h"
 
+using namespace std;
+
 #ifdef SUPPORT_WIN32AUDIO
 
 #include <EST_system.h>

diff --git a/base_class/EST_DMatrix.cc b/base_class/EST_DMatrix.cc
@@ -52,6 +52,8 @@
 #include "EST_Token.h"
 #include "rateconv.h"
 
+using namespace std;
+
 EST_String EST_DMatrix::default_file_type = "est_ascii";
 
 EST_DMatrix::EST_DMatrix(const EST_DMatrix &a, int b)

diff --git a/base_class/EST_FeatureData.cc b/base_class/EST_FeatureData.cc
@@ -50,6 +50,7 @@
 
 #include "EST_THash.h"
 
+using namespace std;
 
 EST_FeatureData::EST_FeatureData()
 {

diff --git a/base_class/EST_Option.cc b/base_class/EST_Option.cc
@@ -42,6 +42,12 @@
 #include "EST_io_aux.h"
 #include "EST_Token.h"
 
+#include <iostream>
+using std::cin;
+using std::cout;
+using std::cerr;
+using std::endl;
+
 static const EST_String Empty_String("");
 
 // Fills in keyval pair. If Key already exists, overwrites value.

diff --git a/base_class/EST_THash.cc b/base_class/EST_THash.cc
@@ -213,7 +213,7 @@ int EST_THash<K,V>::remove_item(const K &rkey, int quiet)
       }
 
   if (!quiet)
-    cerr << "THash: no item labelled \"" << rkey << "\"" << endl;
+    std::cerr << "THash: no item labelled \"" << rkey << "\"" << std::endl;
   return -1;
 }
 

diff --git a/base_class/EST_TList.cc b/base_class/EST_TList.cc
@@ -109,7 +109,7 @@ template<class T> EST_TList<T> &EST_TList<T>::operator+=(const EST_TList<T> &a)
 {
     if (this == &a)
     {
-	cerr << "EST_TList: error: tried to add list to itself\n";
+	std::cerr << "EST_TList: error: tried to add list to itself\n";
 	return *this;
     }
     copy_items(a);

diff --git a/base_class/EST_TNamedEnum.cc b/base_class/EST_TNamedEnum.cc
@@ -141,7 +141,7 @@ INFO &EST_TValuedEnumI<ENUM,VAL,INFO>::info (ENUM token) const
     if (this->definitions[i].token == token)
       return this->definitions[i].info;
 
-  cerr << "Fetching info for invalid entry\n";
+  std::cerr << "Fetching info for invalid entry" << std::endl;
   abort();
 
   static INFO dummyI;
@@ -198,7 +198,7 @@ EST_read_status EST_TNamedEnum<ENUM>::priv_load(EST_String name, EST_TNamedEnum<
     {
       if ( buffer[LINE_LENGTH-1] != 'x')
 	{
-	  cerr << "line too long .. '" << buffer << "'\n";
+	  std::cerr << "line too long .. '" << buffer << "'\n";
 	  return wrong_format;
 	}
 
@@ -208,7 +208,7 @@ EST_read_status EST_TNamedEnum<ENUM>::priv_load(EST_String name, EST_TNamedEnum<
 
 	  if ( n>= this->ndefinitions)
 	    {
-	      cerr << "too many definitions\n";
+	      std::cerr << "too many definitions\n";
 	      return wrong_format;
 	    }
 
@@ -227,12 +227,12 @@ EST_read_status EST_TNamedEnum<ENUM>::priv_load(EST_String name, EST_TNamedEnum<
 	  // definition by standard name
 	  if (!definitive)
 	    {
-	      cerr << "can't use names in this definition\n";
+	      std::cerr << "can't use names in this definition\n";
 	      return wrong_format;
 	    }
 	  if ( n>= this->ndefinitions)
 	    {
-	      cerr << "too many definitions\n";
+	      std::cerr << "too many definitions\n";
 	      return wrong_format;
 	    }
 
@@ -256,7 +256,7 @@ EST_read_status EST_TNamedEnum<ENUM>::priv_load(EST_String name, EST_TNamedEnum<
 
 	  if (eq <0)
 	    {
-	      cerr << "bad header line '" << line;
+	      std::cerr << "bad header line '" << line;
 	      return wrong_format;
 	    }
 
@@ -284,7 +284,7 @@ EST_read_status EST_TNamedEnum<ENUM>::priv_load(EST_String name, EST_TNamedEnum<
 	    }
 	  else
 	    {
-	      cerr << "bad header line '" << line;
+	      std::cerr << "bad header line '" << line;
 	      return wrong_format;
 	    }
 

diff --git a/base_class/EST_Token.cc b/base_class/EST_Token.cc
@@ -50,6 +50,8 @@
 #include "EST_cutils.h"
 #include "EST_error.h"
 
+using namespace std;
+
 const EST_String EST_Token_Default_WhiteSpaceChars = " \t\n\r";
 const EST_String EST_Token_Default_SingleCharSymbols = "(){}[]";
 const EST_String EST_Token_Default_PrePunctuationSymbols = "\"'`({[";
@@ -246,7 +248,7 @@ int EST_TokenStream::open(FILE *ofp, int close_when_finished)
     return 0;
 }
 
-int EST_TokenStream::open(istream &newis)
+int EST_TokenStream::open(std::istream &newis)
 {
     // absorb already open istream 
     if (type != tst_none)

diff --git a/base_class/EST_UList.cc b/base_class/EST_UList.cc
@@ -37,6 +37,8 @@
 /*************************************************************************/
 #include <EST_UList.h>
 
+using namespace std;
+
 void EST_UList::clear_and_free(void (*item_free)(EST_UItem *p))
 {
     EST_UItem *q, *np;

diff --git a/base_class/EST_features_aux.cc b/base_class/EST_features_aux.cc
@@ -44,6 +44,8 @@
 
 #include "EST_get_function_template.h"
 
+using namespace std;
+
 defineGetFunction(EST_Features, val, EST_Val, getVal)
 defineGetFunction(EST_Features, val, EST_String, getString)
 defineGetFunction(EST_Features, val, float, getFloat)

diff --git a/base_class/EST_features_io.cc b/base_class/EST_features_io.cc
@@ -43,6 +43,8 @@
 #include "EST_String.h"
 #include "EST_Token.h"
 
+using namespace std;
+
 void EST_Features::set_function(const EST_String &name, 
 			        const EST_String &funcname)
 {

diff --git a/base_class/EST_matrix_support.cc b/base_class/EST_matrix_support.cc
@@ -45,6 +45,8 @@
 
 const int EST_CURRENT=-1;
 const int EST_ALL=-1;
+using namespace std;
+
 
 bool EST_matrix_bounds_check(int r,
 			     int c,

diff --git a/base_class/EST_slist_aux.cc b/base_class/EST_slist_aux.cc
@@ -50,6 +50,8 @@
 #include "EST_cutils.h"
 #include "EST_Token.h"
 
+using namespace std;
+
 int StrListtoFList(EST_StrList &s, EST_FList &f)
 {
     EST_Litem *p;

diff --git a/base_class/EST_svec_aux.cc b/base_class/EST_svec_aux.cc
@@ -49,6 +49,8 @@
 #include "EST_cutils.h"
 #include "EST_Token.h"
 
+using namespace std;
+
 EST_read_status load_TList_of_StrVector(EST_TList<EST_StrVector> &w,
 					const EST_String &filename,
 					const int vec_len)

diff --git a/base_class/inst_tmpl/vector_f_t.cc b/base_class/inst_tmpl/vector_f_t.cc
@@ -69,9 +69,9 @@ EST_write_status save(const EST_String &filename, const EST_TVector<float> &a)
     {
       *outf << a(i) << "\t";
     }
-    *outf << endl;
+    *outf << std::endl;
 
-    if (outf != &cout)
+    if (outf != &std::cout)
 	delete outf;
     return write_ok;
 }

diff --git a/base_class/string/EST_Chunk.cc b/base_class/string/EST_Chunk.cc
@@ -45,6 +45,8 @@
 #include <cstring>
 #include "EST_Chunk.h"
 
+using namespace std;
+
 EST_Chunk::EST_Chunk ()
 {
   count = 0;

diff --git a/base_class/string/EST_Regex.cc b/base_class/string/EST_Regex.cc
@@ -59,6 +59,8 @@
 #include "EST_String.h"
 #include "EST_Regex.h"
 
+using namespace std;
+
 #ifdef sun
 #ifndef __svr4__
 /* SunOS */

diff --git a/base_class/vec_mat_aux.cc b/base_class/vec_mat_aux.cc
@@ -44,6 +44,8 @@
 #include "EST_math.h"
 #include <ctime>
 
+using namespace std;
+
 bool polynomial_fit(EST_FVector &x, EST_FVector &y, 
 		    EST_FVector &co_effs, int order)
 {
@@ -60,7 +62,7 @@ bool polynomial_fit(EST_FVector &x, EST_FVector &y, EST_FVector &co_effs,
 {
 
     if(order <= 0){
-	cerr << "polynomial_fit : order must be >= 1" << endl;
+	std::cerr << "polynomial_fit : order must be >= 1" << std::endl;
 	return false;
     }
 

diff --git a/base_class/vec_mat_aux_d.cc b/base_class/vec_mat_aux_d.cc
@@ -42,6 +42,8 @@
 #include "EST_math.h"
 #include "EST_unix.h"
 
+using namespace std;
+
 bool polynomial_fit(EST_DVector &x, EST_DVector &y, 
 		    EST_DVector &co_effs, int order)
 {

diff --git a/base_class/vec_mat_aux_i.cc b/base_class/vec_mat_aux_i.cc
@@ -44,6 +44,8 @@
 #include "EST_math.h"
 #include <time.h>
 
+using namespace std;
+
 int matrix_max(const EST_IMatrix &a)
 {
     int i, j;

diff --git a/grammar/ngram/EST_PST.cc b/grammar/ngram/EST_PST.cc
@@ -48,6 +48,8 @@
 #include "EST_PST.h"
 #include "EST_multistats.h"
 
+using namespace std;
+
 VAL_REGISTER_CLASS(pstnode,EST_PredictionSuffixTree_tree_node)
 
 // Out of vocabulary identifier

diff --git a/grammar/ngram/EST_lattice.cc b/grammar/ngram/EST_lattice.cc
@@ -41,6 +41,8 @@
 #include <fstream>
 #include <cstdlib>
 
+using namespace std;
+
 Lattice::Lattice()
 {
     tf=0;

diff --git a/grammar/ngram/EST_lattice_io.cc b/grammar/ngram/EST_lattice_io.cc
@@ -44,6 +44,8 @@
 #include "EST_Token.h"
 #include "EST_StringTrie.h"
 
+using namespace std;
+
 bool save(Lattice &lattice, EST_String filename)
 {
     ostream *outf;

diff --git a/grammar/ngram/freqsmooth.cc b/grammar/ngram/freqsmooth.cc
@@ -49,6 +49,8 @@
 #include <cfloat>
 #include "EST_Ngrammar.h"
 
+using namespace std;
+
 static double fs_find_backoff_prob(EST_Ngrammar *backoff_ngrams,
 				       int order,const EST_StrVector words,
 				       int smooth_thresh);

diff --git a/grammar/ngram/ngrammar_aux.cc b/grammar/ngram/ngrammar_aux.cc
@@ -42,6 +42,8 @@
 #include "EST_String.h"
 #include "EST_Ngrammar.h"
 
+using namespace std;
+
 static bool
 ExponentialFit(EST_DVector &N, double &a, double &b, int first, int last)
 {

diff --git a/grammar/ngram/ngrammar_io.cc b/grammar/ngram/ngrammar_io.cc
@@ -50,6 +50,8 @@
 #include "EST_Token.h"
 #include "EST_cutils.h"
 
+using namespace std;
+
 EST_read_status
 load_ngram_htk_ascii(const EST_String filename, EST_Ngrammar &n)
 {

diff --git a/grammar/ngram/ngrammar_utils.cc b/grammar/ngram/ngrammar_utils.cc
@@ -44,6 +44,8 @@
 #include "EST_error.h"
 #include "EST_Ngrammar.h"
 
+using namespace std;
+
 static int get_next_window(EST_TokenStream &ts,
 			   EST_StrVector &window,
 			   const EST_String &input_format,

diff --git a/grammar/scfg/EST_SCFG.cc b/grammar/scfg/EST_SCFG.cc
@@ -41,6 +41,8 @@
 #include "EST_Pathname.h"
 #include "EST_SCFG.h"
 
+using namespace std;
+
 EST_SCFG_Rule::EST_SCFG_Rule(double prob,int p, int m)
 { 
     set_rule(prob,p,m);
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,7 @@ @@
     #include "EST_THash.h"
+    using namespace std;
     EST_FeatureData::EST_FeatureData()
     {
@@ Expand Down @@