rpms/festival/devel speech_tools-1.2.95-gcc4.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/festival/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1046

Modified Files:
	speech_tools-1.2.95-gcc4.patch 
Log Message:
- more gcc4 fixes


speech_tools-1.2.95-gcc4.patch:
 include/EST_simplestats.h |   12 ++++++------
 ling_class/item_feats.cc  |    2 +-
 siod/siod_est.cc          |    2 +-
 stats/EST_DProbDist.cc    |   18 +++++++++---------
 4 files changed, 17 insertions(+), 17 deletions(-)

Index: speech_tools-1.2.95-gcc4.patch
===================================================================
RCS file: /cvs/dist/rpms/festival/devel/speech_tools-1.2.95-gcc4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- speech_tools-1.2.95-gcc4.patch	28 Apr 2005 18:27:25 -0000	1.2
+++ speech_tools-1.2.95-gcc4.patch	28 Apr 2005 19:30:50 -0000	1.3
@@ -9,6 +9,32 @@
  
  #if defined(INSTANTIATE_TEMPLATES)
  #include "../base_class/EST_THash.cc"
+--- speech_tools/include/EST_simplestats.h.gcc4	2005-04-28 15:25:47.000000000 -0400
++++ speech_tools/include/EST_simplestats.h	2005-04-28 15:24:21.000000000 -0400
+@@ -265,17 +265,17 @@
+     /// 
+     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 returns name given index 
+-    const EST_String &item_name(int idx) const;
++    const EST_String &item_name(size_t idx) const;
+     /// During iteration returns 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 returns 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 vocabulary of distribution
+     inline const EST_Discrete *const get_discrete() const { return discrete; };
 --- speech_tools/ling_class/item_feats.cc.gcc4	2005-04-28 14:17:55.000000000 -0400
 +++ speech_tools/ling_class/item_feats.cc	2005-04-28 14:18:21.000000000 -0400
 @@ -78,7 +78,7 @@
@@ -20,3 +46,70 @@
  
      return name;
  }
+--- speech_tools/stats/EST_DProbDist.cc.gcc4	2005-04-28 15:25:17.000000000 -0400
++++ speech_tools/stats/EST_DProbDist.cc	2005-04-28 15:24:21.000000000 -0400
+@@ -305,15 +305,15 @@
+ }
+ 
+ //  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 @@
+ 	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 @@
+ 	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_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 @@
+ 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;