commoncpp2: fix with gcc9

The headers are still public, so revbump, as anything using them
would also fail.
This commit is contained in:
q66 2019-12-17 17:01:37 +01:00
parent 0d625dad26
commit 97a0e12536
2 changed files with 25 additions and 2 deletions

View file

@ -0,0 +1,23 @@
C++ does not allow specifying default arguments on friend declarations.
We can simply do this as getline is not otherwise publicly declared.
--- inc/cc++/string.h
+++ inc/cc++/string.h
@@ -731,7 +731,7 @@ public:
* @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++
@@ -743,7 +743,7 @@ public:
* Stream input into our variable.
*/
inline friend std::istream &operator>>(std::istream &is, String &str)
- {return getline(is, str);};
+ {return getline(is, str, '\n', 0);};
#ifdef HAVE_SNPRINTF
/**

View file

@ -1,12 +1,12 @@
# Template file for 'commoncpp2' # Template file for 'commoncpp2'
pkgname=commoncpp2 pkgname=commoncpp2
version=1.8.1 version=1.8.1
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
makedepends="libgcc-devel zlib-devel" makedepends="libgcc-devel zlib-devel"
short_desc="GNU Common C++ 2" short_desc="GNU Common C++ 2"
maintainer="David <kalichakra@zoho.com>" maintainer="David <kalichakra@zoho.com>"
license="GPL-3" license="GPL-3.0-or-later"
homepage='http://www.gnu.org/software/commoncpp/' homepage='http://www.gnu.org/software/commoncpp/'
distfiles="${GNU_SITE}/commoncpp/$pkgname-${version}.tar.gz" distfiles="${GNU_SITE}/commoncpp/$pkgname-${version}.tar.gz"
checksum="53ced4aff74e28a1d8018eb2b4974519028db3c12471ab6dff1c873578c9af4e" checksum="53ced4aff74e28a1d8018eb2b4974519028db3c12471ab6dff1c873578c9af4e"