summaryrefslogtreecommitdiff
path: root/misc/vfu
diff options
context:
space:
mode:
authorjoerg <joerg>2013-07-18 12:06:10 +0000
committerjoerg <joerg>2013-07-18 12:06:10 +0000
commit70e609c7f01ab641f3c2b265faf0152d05f7f866 (patch)
treec3e4fdb2a5eb84256e4fafa67da835b20e6c499d /misc/vfu
parent55bf26657d27eba0874df0642efa61a239533b1b (diff)
downloadpkgsrc-70e609c7f01ab641f3c2b265faf0152d05f7f866.tar.gz
ISO C++ doesn't allow default arguments on friends, if it isn't a
declaration.
Diffstat (limited to 'misc/vfu')
-rw-r--r--misc/vfu/distinfo3
-rw-r--r--misc/vfu/patches/patch-vslib_vstring.h29
2 files changed, 31 insertions, 1 deletions
diff --git a/misc/vfu/distinfo b/misc/vfu/distinfo
index cebc50f1036..681fa30bec9 100644
--- a/misc/vfu/distinfo
+++ b/misc/vfu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/10/02 14:33:58 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/07/18 12:06:10 joerg Exp $
SHA1 (vfu-3.04.src.tar.gz) = 75e87d102114dc08136420e7927e687f72a52dfd
RMD160 (vfu-3.04.src.tar.gz) = a0d1ba84d9c66216b444226ceace190ada0e795a
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = 4a161a1df84001bdefc81384128ea74bf9d7f61d
SHA1 (patch-aj) = 265fbb0873ce0b910ba6a53da57a18269af34b82
SHA1 (patch-ak) = cfcfb94f1ba6169ef471ae47fdcd9ccc81196a39
SHA1 (patch-al) = bd947171f2027243bebe889c537426124459e2e1
+SHA1 (patch-vslib_vstring.h) = d93cb8362ad11d0a62acaf8ab56e4aace0fd4f7f
diff --git a/misc/vfu/patches/patch-vslib_vstring.h b/misc/vfu/patches/patch-vslib_vstring.h
new file mode 100644
index 00000000000..4cc620d08d0
--- /dev/null
+++ b/misc/vfu/patches/patch-vslib_vstring.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-vslib_vstring.h,v 1.1 2013/07/18 12:06:10 joerg Exp $
+
+ISO C++ forbids default arguments on friend definitions that are not
+declarations, so split them off.
+
+--- vslib/vstring.h.orig 2013-07-17 14:05:27.000000000 +0000
++++ vslib/vstring.h
+@@ -180,8 +180,8 @@
+ friend String& str_cut ( String& target, const char* charlist ); // does `CutR(charlist);CutL(charlist);'
+ friend String& str_cut_spc ( String& target ); // does `Cut(" ");'
+
+- friend String& str_pad ( String& target, int len, char ch = ' ' );
+- friend String& str_comma( String& target, char delim = ',' );
++ friend String& str_pad ( String& target, int len, char ch);
++ friend String& str_comma( String& target, char delim);
+
+ // next 3 functions are safe! so if you get/set out f the string range!
+ friend void str_set_ch( String& target, int pos, const char ch ); // sets `ch' char at position `pos'
+@@ -209,6 +209,10 @@
+
+ }; /* end of String class */
+
++
++ String& str_pad ( String& target, int len, char ch = '=');
++ String& str_comma( String& target, char delim = '=');
++
+ /****************************************************************************
+ **
+ ** STRING Functions (for class String)