Don't use default arguments in friend declarations.

6 files changed, 61 insertions, 2 deletions

diff --git a/editors/TeXmacs-devel/distinfo b/editors/TeXmacs-devel/distinfo
index a72cb41cf19..bfbe03d6a58 100644
--- a/editors/TeXmacs-devel/distinfo
+++ b/editors/TeXmacs-devel/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.5 2013/04/10 16:10:19 drochner Exp $
+$NetBSD: distinfo,v 1.6 2013/08/13 10:21:35 joerg Exp $
 
 SHA1 (TeXmacs-1.0.7.19-src.tar.gz) = 855b8252f561b69deb45a3b80f4531a9055ea465
 RMD160 (TeXmacs-1.0.7.19-src.tar.gz) = df43e8e6b9ca6f12bd64e20a4d447309e3cead5e
 Size (TeXmacs-1.0.7.19-src.tar.gz) = 18384340 bytes
+SHA1 (patch-TeXmacs_plugins_python_progs_init-python.scm) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-TeXmacs_plugins_r_src_tm__r.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-TeXmacs_plugins_shell_src_tm__shell.cpp) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99
 SHA1 (patch-ac) = 78e437e518a8fb61a0e07ca8279ac5da1e19f8d3
 SHA1 (patch-ad) = 62fee9dd4e3f0102b0741e83c1f7bf637dd8d6e8
@@ -11,3 +14,5 @@ SHA1 (patch-aj) = 7866c3387ece95f8d06face1c7f0a89ef0ce5d56
 SHA1 (patch-al) = f7deed3d692af322aebe1a4068dfd3bde9e87a0a
 SHA1 (patch-ba) = b6c3f8ae26cb0cfe6aaf616384173e4b20f94c11
 SHA1 (patch-bb) = 647339abf556784a567a26cec61c7105bb29825d
+SHA1 (patch-src_Kernel_Types_tree.hpp) = d090dead92075d12c8b0a47f9a30bdda443cfc4b
+SHA1 (patch-src_Typeset_boxes.hpp) = 2666462c42104085d950631f80f5c039636ed0d9
diff --git a/editors/TeXmacs-devel/patches/patch-src_Kernel_Types_tree.hpp b/editors/TeXmacs-devel/patches/patch-src_Kernel_Types_tree.hpp
new file mode 100644
index 00000000000..5f2784eec97
--- /dev/null
+++ b/editors/TeXmacs-devel/patches/patch-src_Kernel_Types_tree.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Kernel_Types_tree.hpp,v 1.1 2013/08/13 10:21:35 joerg Exp $
+
+--- src/Kernel/Types/tree.hpp.orig	2013-03-18 16:56:35.000000000 +0000
++++ src/Kernel/Types/tree.hpp
+@@ -84,7 +84,7 @@ public:
+   friend tree& operator << (tree& t, array<tree> a);
+   friend tm_ostream& operator << (tm_ostream& out, tree t);
+   friend tree operator * (tree t1, tree t2);
+-  friend void print_tree (tree t, int tab=0);
++  friend void print_tree (tree t, int tab);
+   friend list<tree> as_trees (list<pointer> l);
+   friend class tree_pointer_rep;
+   friend class tree_position_rep;
diff --git a/editors/TeXmacs-devel/patches/patch-src_Typeset_boxes.hpp b/editors/TeXmacs-devel/patches/patch-src_Typeset_boxes.hpp
new file mode 100644
index 00000000000..04ee6a8ae33
--- /dev/null
+++ b/editors/TeXmacs-devel/patches/patch-src_Typeset_boxes.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Typeset_boxes.hpp,v 1.1 2013/08/13 10:21:35 joerg Exp $
+
+--- src/Typeset/boxes.hpp.orig	2012-07-09 15:05:21.000000000 +0000
++++ src/Typeset/boxes.hpp
+@@ -250,7 +250,7 @@ public:
+   friend struct lazy_paragraph_rep;
+   friend class  phrase_box_rep;
+   friend class  remember_box_rep;
+-  friend void make_eps (url dest, box b, int dpi= 600);
++  friend void make_eps (url dest, box b, int dpi);
+ };
+ ABSTRACT_NULL_CODE(box);
+ 
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index d44b1b9d8ae..bf072e14870 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2012/11/16 20:09:47 joerg Exp $
+$NetBSD: distinfo,v 1.63 2013/08/13 10:21:35 joerg Exp $
 
 SHA1 (TeXmacs-1.0.6.15-src.tar.gz) = bd11a9176c7a3627322a374cd27d5eecfcd2527f
 RMD160 (TeXmacs-1.0.6.15-src.tar.gz) = 97388fd96f110bd97ff5386e50b37530c24822ee
@@ -14,3 +14,5 @@ SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15
 SHA1 (patch-ak) = dede7b76bac02e1a6395a7cb698990e385edebc8
 SHA1 (patch-al) = f7deed3d692af322aebe1a4068dfd3bde9e87a0a
 SHA1 (patch-src_Kernel_Abstractions_basic.hpp) = f7987b901d6b2524f086660da6e3a7836b16f557
+SHA1 (patch-src_Kernel_Types_tree.hpp) = f1799c7278e54673dea51158de727094b5740ae7
+SHA1 (patch-src_Typeset_boxes.hpp) = b022e4d571b18941537b34efcbde2890ee22c60d
diff --git a/editors/TeXmacs/patches/patch-src_Kernel_Types_tree.hpp b/editors/TeXmacs/patches/patch-src_Kernel_Types_tree.hpp
new file mode 100644
index 00000000000..6eca2edde71
--- /dev/null
+++ b/editors/TeXmacs/patches/patch-src_Kernel_Types_tree.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Kernel_Types_tree.hpp,v 1.1 2013/08/13 10:21:35 joerg Exp $
+
+--- src/Kernel/Types/tree.hpp.orig	2013-08-12 16:26:56.000000000 +0000
++++ src/Kernel/Types/tree.hpp
+@@ -74,7 +74,7 @@ public:
+   friend tree& operator << (tree& t, array<tree> a);
+   friend ostream& operator << (ostream& out, tree t);
+   friend tree operator * (tree t1, tree t2);
+-  friend void print_tree (tree t, int tab=0);
++  friend void print_tree (tree t, int tab);
+   friend list<tree> as_trees (list<pointer> l);
+   friend class tree_pointer_rep;
+   friend class tree_position_rep;
diff --git a/editors/TeXmacs/patches/patch-src_Typeset_boxes.hpp b/editors/TeXmacs/patches/patch-src_Typeset_boxes.hpp
new file mode 100644
index 00000000000..c1485fabc50
--- /dev/null
+++ b/editors/TeXmacs/patches/patch-src_Typeset_boxes.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Typeset_boxes.hpp,v 1.1 2013/08/13 10:21:35 joerg Exp $
+
+--- src/Typeset/boxes.hpp.orig	2013-08-12 16:27:23.000000000 +0000
++++ src/Typeset/boxes.hpp
+@@ -249,7 +249,7 @@ public:
+   friend struct lazy_paragraph_rep;
+   friend class  phrase_box_rep;
+   friend class  remember_box_rep;
+-  friend void make_eps (url dest, box b, int dpi= 600);
++  friend void make_eps (url dest, box b, int dpi);
+ };
+ ABSTRACT_NULL_CODE(box);
+