[patch] Fixes C++ stuff so that speech-tools will compile with gcc 4

speech-tools-gcc4.0.diff (text/plain), 5.14 KB, created by Meethune Bhowmick on 2005-12-19 04:03:05 UTC

diff -puNr speech_tools.gcc34/include/EST_Chunk.h speech_tools/include/EST_Chunk.h
--- speech_tools.gcc34/include/EST_Chunk.h	2005-12-19 05:02:54.264538000 -0600
+++ speech_tools/include/EST_Chunk.h	2005-12-19 05:03:17.743968736 -0600
@@ -105,6 +105,8 @@ using namespace std;
  /*                                                                      */
  /************************************************************************/
 
+class EST_ChunkPtr;
+
 class EST_Chunk  {
   public:
     typedef  unsigned short use_counter;
diff -puNr speech_tools.gcc34/include/EST_simplestats.h speech_tools/include/EST_simplestats.h
--- speech_tools.gcc34/include/EST_simplestats.h	2001-04-04 06:55:32.000000000 -0500
+++ speech_tools/include/EST_simplestats.h	2005-12-19 05:07:11.439441624 -0600
@@ -260,17 +260,17 @@ public:
     /// 
     double frequency(const int i) const; 
     /// Used for iterating through members of the distribution
-    int item_start() const;
+    size_t item_start() const;
     /// Used for iterating through members of the distribution
-    int item_next(int idx) const;
+    size_t item_next(size_t idx) const;
     /// Used for iterating through members of the distribution
-    int item_end(int idx) const;
+    size_t item_end(size_t idx) const;
     /// During iteration ruturns name given index 
-    const EST_String &item_name(int idx) const;
+    const EST_String &item_name(size_t idx) const;
     /// During iteration ruturns name and frequency given index  
-    void item_freq(int idx,EST_String &s,double &freq) const;
+    void item_freq(size_t idx,EST_String &s,double &freq) const;
     /// During iteration ruturns name and probability given index
-    void item_prob(int idx,EST_String &s,double &prob) const;
+    void item_prob(size_t idx,EST_String &s,double &prob) const;
 
     /// Returns discrete vocabilary of distribution
     inline const EST_Discrete *const get_discrete() const { return discrete; };
diff -puNr speech_tools.gcc34/ling_class/item_feats.cc speech_tools/ling_class/item_feats.cc
--- speech_tools.gcc34/ling_class/item_feats.cc	2001-04-04 06:55:32.000000000 -0500
+++ speech_tools/ling_class/item_feats.cc	2005-12-19 05:03:17.738969496 -0600
@@ -78,7 +78,7 @@ EST_String get_featname(const EST_Item_f
    EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);
 
    if (!found)
-	EST_error("featfunc 0x%x has no name", (int)func);
+	EST_error("featfunc 0x%x has no name", func);
 
     return name;
 }
diff -puNr speech_tools.gcc34/siod/siod_est.cc speech_tools/siod/siod_est.cc
--- speech_tools.gcc34/siod/siod_est.cc	2001-04-04 06:55:32.000000000 -0500
+++ speech_tools/siod/siod_est.cc	2005-12-19 05:03:17.729970864 -0600
@@ -52,7 +52,7 @@
 #include "EST_Track.h"
 #include "EST_track_aux.h"
 
-Declare_TStringHash_Base(LISP,NIL,NIL)
+Declare_TStringHash_Base(LISP,(LISP)0,NIL)
 
 #if defined(INSTANTIATE_TEMPLATES)
 #include "../base_class/EST_THash.cc"
diff -puNr speech_tools.gcc34/stats/EST_DProbDist.cc speech_tools/stats/EST_DProbDist.cc
--- speech_tools.gcc34/stats/EST_DProbDist.cc	2001-04-04 06:55:32.000000000 -0500
+++ speech_tools/stats/EST_DProbDist.cc	2005-12-19 05:03:17.740969192 -0600
@@ -305,15 +305,15 @@ double EST_DiscreteProbDistribution::ent
 }
 
 //  For iterating through members of a probability distribution
-int EST_DiscreteProbDistribution::item_start(void) const
+size_t EST_DiscreteProbDistribution::item_start(void) const
 {
     if (type == tprob_discrete)
 	return 0;
     else
-	return (int)scounts.list.head();
+	return (size_t)scounts.list.head();
 }
 
-int EST_DiscreteProbDistribution::item_end(int idx) const
+size_t EST_DiscreteProbDistribution::item_end(size_t idx) const
 {
     if (type == tprob_discrete)
 	return (idx >= icounts.length());
@@ -321,15 +321,15 @@ int EST_DiscreteProbDistribution::item_e
 	return ((EST_Litem *)idx == 0);
 }
 
-int EST_DiscreteProbDistribution::item_next(int idx) const
+size_t EST_DiscreteProbDistribution::item_next(size_t idx) const
 {
     if (type == tprob_discrete)
 	return ++idx;
     else
-	return (int)next((EST_Litem *)idx);
+	return (size_t)next((EST_Litem *)idx);
 }
 
-const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
+const EST_String &EST_DiscreteProbDistribution::item_name(size_t idx) const
 {
     if (type == tprob_discrete)
 	return discrete->name(idx);
@@ -337,7 +337,7 @@ const EST_String &EST_DiscreteProbDistri
 	return scounts.list((EST_Litem *)idx).k;
 }
 
-void EST_DiscreteProbDistribution::item_freq(int idx,EST_String &s,double &freq) const
+void EST_DiscreteProbDistribution::item_freq(size_t idx,EST_String &s,double &freq) const
 {
     if (type == tprob_discrete)
     {
@@ -351,7 +351,7 @@ void EST_DiscreteProbDistribution::item_
     }
 }
 
-void EST_DiscreteProbDistribution::item_prob(int idx,EST_String &s,double &prob) const
+void EST_DiscreteProbDistribution::item_prob(size_t idx,EST_String &s,double &prob) const
 {
     if (type == tprob_discrete)
     {
@@ -368,7 +368,7 @@ void EST_DiscreteProbDistribution::item_
 ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
 {
     // Output best with probabilities
-    int i;
+    size_t i;
     double prob;
     double sum=0;
     EST_String name;