gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-03 16:47:21 -08:00
Code Issues Projects Releases Wiki Activity

dev-cpp/commoncpp2: Fix building against GCC 9

Browse Source 
Closes: https://bugs.gentoo.org/686012
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert
2019-06-22 11:48:30 +02:00
parent 49e94f5aea
commit 10e0e9358b
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
+1
View File
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}/1.8.1-fix-c++14.patch"
"${FILESDIR}/1.8.1-gnutls-3.4.patch"
"${FILESDIR}/1.8.1-libressl.patch" # bug 674416
"${FILESDIR}/1.8.1-fix-gcc9.patch" # bug 686012
)
src_prepare() {
dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch
+28
View File
@@ -0,0 +1,28 @@
https://bugs.gentoo.org/686012
In file included from ../inc/cc++/thread.h:50,
from thread.cpp:41:
../inc/cc++/string.h:734:35: error: friend declaration of ‘std::istream& getline(std::istream&, ost::String&, char, size_t)’ specifies default arguments and isn’t a definition [-fpermissive]
734 | friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
| ^~~~~~~
--- a/inc/cc++/string.h
+++ b/inc/cc++/string.h
@@ -58,6 +58,9 @@
class MemPager;
+class String;
+__EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
+
/**
* This is a generic and portable string class. It uses optimized
* memory allocation strategies to efficiently handle smaller string
@@ -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 std::istream &getline(std::istream &is, String &str, char delim, size_t size);
/**
* Stream the content of our string variable directly to a C++