ISO C++ doesn't allow default arguments on friends, if they are not

declarations as well.

3 files changed, 90 insertions, 1 deletions

diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index 0d290abe560..16ab92ba934 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2013/06/13 21:40:43 joerg Exp $
+$NetBSD: distinfo,v 1.22 2013/07/18 11:57:42 joerg Exp $
 
 SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77
 RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b
@@ -19,7 +19,9 @@ SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 8a2a4c
 SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = 1d64a2e5aa1dc8c5b7d275e2bf66b2e96b599c35
 SHA1 (patch-speech__tools_config_compilers_gcc__defaults.mak) = 7441f2e424046dd50c1531160a5b5f94b8506e9d
 SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8130f1bc33c8d74219bafd9a
+SHA1 (patch-speech__tools_include_EST__Ngrammar.h) = 60386b763231dc096632405a0d2c552a006f6269
 SHA1 (patch-speech__tools_include_EST__SCFG.h) = d58bc030dec4d526a89719e32c3624c642f33f3e
+SHA1 (patch-speech__tools_include_EST__String.h) = 21961c1864eddc025a763081315b7f40f2450735
 SHA1 (patch-speech__tools_include_EST__TIterator.h) = db7617f5c4a802672ce3b098ecd512b6cdb96aeb
 SHA1 (patch-speech__tools_include_EST__TNamedEnum.h) = f240a338d17d7a36a5dba1b0f3b48190b235bf03
 SHA1 (patch-speech__tools_include_EST__error.h) = 26c99948bee89f11b39efbb9d6eb195e1fb1602d
diff --git a/audio/festival/patches/patch-speech__tools_include_EST__Ngrammar.h b/audio/festival/patches/patch-speech__tools_include_EST__Ngrammar.h
new file mode 100644
index 00000000000..9442e54e472
--- /dev/null
+++ b/audio/festival/patches/patch-speech__tools_include_EST__Ngrammar.h
@@ -0,0 +1,57 @@
+$NetBSD: patch-speech__tools_include_EST__Ngrammar.h,v 1.1 2013/07/18 11:57:42 joerg Exp $
+
+--- spech_tools/include/EST_Ngrammar.h.orig	2013-07-17 14:46:59.000000000 +0000
++++ spech_tools/include/EST_Ngrammar.h
+@@ -538,18 +538,18 @@ public:
+ 						     double floor);
+     friend EST_write_status save_ngram_htk_ascii(const EST_String filename, 
+ 						 EST_Ngrammar &n,
+-						 double floor=0.0);
++						 double floor);
+ 
+     //friend EST_write_status save_ngram_htk_binary(const EST_String filename, 
+     //					  EST_Ngrammar &n);
+     friend EST_write_status save_ngram_cstr_ascii(const EST_String filename, 
+ 						  EST_Ngrammar &n,
+-						  const bool trace=false,
+-						  double floor=0.0);
++						  const bool trace,
++						  double floor);
+     friend EST_write_status save_ngram_cstr_bin(const EST_String filename, 
+ 						EST_Ngrammar &n, 
+-						const bool trace=false,
+-						double floor=0.0);
++						const bool trace,
++						double floor);
+     friend EST_write_status save_ngram_arpa(const EST_String filename, 
+ 					    EST_Ngrammar &n);
+     friend EST_write_status save_ngram_arpa_sub(ostream *ost, 
+@@ -561,11 +561,11 @@ public:
+     // Auxiliary functions
+     
+     // smoothing
+-friend void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order=0);
+-friend void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order=0);
+-friend bool Good_Turing_smooth(EST_Ngrammar &n, int maxcount, int mincount=0);
++friend void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order);
++friend void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order);
++friend bool Good_Turing_smooth(EST_Ngrammar &n, int maxcount, int mincount);
+ friend void Good_Turing_discount(EST_Ngrammar &ngrammar, const int maxcount,
+-				 const double default_discount=0.5);
++				 const double default_discount);
+ 
+ friend void fs_build_backoff_ngrams(EST_Ngrammar *backoff_ngrams,
+ 				    EST_Ngrammar &ngram);
+@@ -584,6 +584,12 @@ friend class EST_BackoffNgrammar;
+     
+ };
+ 
++void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order=0);
++void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order=0);
++bool Good_Turing_smooth(EST_Ngrammar &n, int maxcount, int mincount=0);
++void Good_Turing_discount(EST_Ngrammar &ngrammar, const int maxcount,
++				 const double default_discount=0.5);
++
+ void Ngram_freqsmooth(EST_Ngrammar &ngram,
+ 		      int smooth_thresh1,
+ 		      int smooth_thresh2);
diff --git a/audio/festival/patches/patch-speech__tools_include_EST__String.h b/audio/festival/patches/patch-speech__tools_include_EST__String.h
new file mode 100644
index 00000000000..28406f610eb
--- /dev/null
+++ b/audio/festival/patches/patch-speech__tools_include_EST__String.h
@@ -0,0 +1,30 @@
+$NetBSD: patch-speech__tools_include_EST__String.h,v 1.1 2013/07/18 11:57:42 joerg Exp $
+
+--- speech_tools/include/EST_String.h.orig	2013-07-17 14:40:20.000000000 +0000
++++ speech_tools/include/EST_String.h
+@@ -574,10 +574,10 @@ public:
+       */
+     //@{
+     friend int fcompare(const EST_String &a, const EST_String &b, 
+-			const unsigned char *table=NULL);
++			const unsigned char *table);
+ 
+     friend int fcompare(const EST_String &a, const char *b, 
+-				const unsigned char *table=NULL);
++				const unsigned char *table);
+     ///
+     friend inline int fcompare(const EST_String &a, const EST_String &b, 
+ 			       const EST_String &table) 
+@@ -643,6 +643,12 @@ int operator == (const char *a, const ES
+ int operator == (const EST_String &a, const EST_String &b);
+ ostream &operator << (ostream &s, const EST_String &str);
+ 
++int fcompare(const EST_String &a, const EST_String &b, 
++	     const unsigned char *table=NULL);
++ 
++int fcompare(const EST_String &a, const char *b, 
++	     const unsigned char *table=NULL);
++
+ #include "EST_Regex.h"
+ 
+ #endif