Date: Tue, 15 Apr 2014 13:27:53 GMT From: Steve Wills <swills@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: acm@FreeBSD.org Subject: ports/188658: [PATCH] devel/commoncpp: fix build on HEAD Message-ID: <201404151327.s3FDRrYG052042@meatwad.mouf.net> Resent-Message-ID: <201404151330.s3FDU0FM069279@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188658
>Category: ports
>Synopsis: [PATCH] devel/commoncpp: fix build on HEAD
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 15 13:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Steve Wills
>Release: FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD meatwad.mouf.net 11.0-CURRENT FreeBSD 11.0-CURRENT #3 r264228M: Sun Apr 13 03:26:28 UTC
>Description:
- Fix build on HEAD
(patch by gahr@, i'm just passing it along)
Port maintainer (acm@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- commoncpp-1.8.1.patch begins here ---
Index: files/patch-inc__cc++__string.h
===================================================================
--- files/patch-inc__cc++__string.h (revision 0)
+++ files/patch-inc__cc++__string.h (working copy)
@@ -0,0 +1,21 @@
+--- inc/cc++/string.h.orig 2014-04-15 15:05:21.000000000 +0200
++++ inc/cc++/string.h 2014-04-15 15:10:46.000000000 +0200
+@@ -74,6 +74,9 @@
+ * @author David Sugar <dyfet@ostel.com>
+ * @short Generic string class.
+ */
++class String;
++std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
++
+ class __EXPORT String
+ {
+ protected:
+@@ -731,7 +734,7 @@
+ * @param delim deliminator to use.
+ * @param size optional size limitor.
+ */
+- friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
++ friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim, size_t size);
+
+ /**
+ * Stream the content of our string variable directly to a C++
Property changes on: files/patch-inc__cc++__string.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- commoncpp-1.8.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404151327.s3FDRrYG052042>