diff options
| author | joerg <joerg@pkgsrc.org> | 2013-08-27 15:43:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-08-27 15:43:19 +0000 |
| commit | 779dea9983d371359159ead0090ea8e10f218ec5 (patch) | |
| tree | 55b95fb0a52a41f402288882b1161cc1fe4c6c38 | |
| parent | 0a95a2f95737ef2a5963ea50ec9077f7abb88fe9 (diff) | |
| download | pkgsrc-779dea9983d371359159ead0090ea8e10f218ec5.tar.gz | |
friend declarations may not introduce default arguments.
| -rw-r--r-- | devel/ddd/distinfo | 3 | ||||
| -rw-r--r-- | devel/ddd/patches/patch-ddd_strclass.h | 50 |
2 files changed, 52 insertions, 1 deletions
diff --git a/devel/ddd/distinfo b/devel/ddd/distinfo index 1f6de31a4ab..c602c652672 100644 --- a/devel/ddd/distinfo +++ b/devel/ddd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2013/04/30 22:15:22 joerg Exp $ +$NetBSD: distinfo,v 1.19 2013/08/27 15:43:19 joerg Exp $ SHA1 (ddd-3.3.12.tar.gz) = b91d2dfb1145af409138bd34517a898341724e56 RMD160 (ddd-3.3.12.tar.gz) = fcc71b2b57f4d7a2c17ac817739674c89e1dd7a0 @@ -7,3 +7,4 @@ SHA1 (patch-Makefile.in) = de1fb079a0870c73aac604ab48996f7a4f2c5258 SHA1 (patch-ai) = 513621cb015cde43736ad9c28e1535358c398992 SHA1 (patch-ddd_VSLDefList.C) = b68263f97d117646dcd5eb577257e610a4a8cbbd SHA1 (patch-ddd_strclass.C) = ad2453f8322d70846c9a816f28bef86e9b0410a3 +SHA1 (patch-ddd_strclass.h) = 42941680cf746ce81505293a5d81fa8477d87387 diff --git a/devel/ddd/patches/patch-ddd_strclass.h b/devel/ddd/patches/patch-ddd_strclass.h new file mode 100644 index 00000000000..be6cae6afc3 --- /dev/null +++ b/devel/ddd/patches/patch-ddd_strclass.h @@ -0,0 +1,50 @@ +$NetBSD: patch-ddd_strclass.h,v 1.1 2013/08/27 15:43:19 joerg Exp $ + +--- ddd/strclass.h.orig 2013-08-27 14:42:50.000000000 +0000 ++++ ddd/strclass.h +@@ -543,7 +543,6 @@ public: + bool OK() const; + }; + +- + class string + { + friend class subString; +@@ -811,9 +810,9 @@ public: + const regex& sep); + + friend string common_prefix(const string& x, const string& y, +- int startpos = 0); ++ int startpos); + friend string common_suffix(const string& x, const string& y, +- int startpos = -1); ++ int startpos); + friend string replicate(char c, int n); + friend string replicate(const string& y, int n); + friend string join(const string *src, int n, const string& sep); +@@ -864,8 +863,8 @@ public: + friend std::istream& operator>>(std::istream& s, string& x); + + friend int readline(std::istream& s, string& x, +- char terminator = '\n', +- int discard_terminator = 1); ++ char terminator, ++ int discard_terminator); + + // Status + unsigned int length() const; +@@ -882,6 +881,14 @@ public: + bool OK() const; + }; + ++string common_prefix(const string& x, const string& y, ++ int startpos = 0); ++string common_suffix(const string& x, const string& y, ++ int startpos = -1); ++int readline(std::istream& s, string& x, ++ char terminator = '\n', ++ int discard_terminator = 1); ++ + // Inject names manually to accomodate argument-dependent name lookup (ADL) + // (aka Koenig lookup). The rule is that friend declarations are visible + // when found through ADL because an argument of the call happens to be |