Mon Apr 29 21:19:15 2013 UTC ()
Be explicit that the local version of bitset is wanted, not the STL
version in std for C++11 libraries.
(joerg)
diff -r1.1 -r1.2 pkgsrc/devel/ucommon/distinfo
diff -r0 -r1.1 pkgsrc/devel/ucommon/patches/patch-commoncpp_address.cpp
--- pkgsrc/devel/ucommon/distinfo 2013/04/17 00:51:20 1.1
+++ pkgsrc/devel/ucommon/distinfo 2013/04/29 21:19:14 1.2
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.1 2013/04/17 00:51:20 rodent Exp $ | | 1 | $NetBSD: distinfo,v 1.2 2013/04/29 21:19:14 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (ucommon-6.0.3.tar.gz) = e3263fe7bb8a37dc00a227218c62a5040ccaf465 | | 3 | SHA1 (ucommon-6.0.3.tar.gz) = e3263fe7bb8a37dc00a227218c62a5040ccaf465 |
| 4 | RMD160 (ucommon-6.0.3.tar.gz) = 4debf5f5c31a6162b9d60041ddb44ca385336f3b | | 4 | RMD160 (ucommon-6.0.3.tar.gz) = 4debf5f5c31a6162b9d60041ddb44ca385336f3b |
| 5 | Size (ucommon-6.0.3.tar.gz) = 806841 bytes | | 5 | Size (ucommon-6.0.3.tar.gz) = 806841 bytes |
| 6 | SHA1 (patch-CMakeLists.txt) = 4d4c11a89111161bc8d8fe3715f643290ecb6149 | | 6 | SHA1 (patch-CMakeLists.txt) = 4d4c11a89111161bc8d8fe3715f643290ecb6149 |
| | | 7 | SHA1 (patch-commoncpp_address.cpp) = 6eedbed1c3095362a00eea581917152de9ca6852 |
$NetBSD: patch-commoncpp_address.cpp,v 1.1 2013/04/29 21:19:15 joerg Exp $
--- commoncpp/address.cpp.orig 2013-04-28 14:29:48.000000000 +0000
+++ commoncpp/address.cpp
@@ -1062,7 +1062,7 @@ void IPV4Cidr::set(const char *cp)
#endif
memset(&netmask, 0, sizeof(netmask));
- bitset((bit_t *)&netmask, getMask(cp));
+ ::bitset((bit_t *)&netmask, getMask(cp));
setString(cbuf, sizeof(cbuf), cp);
ep = (char *)strchr(cp, '/');
@@ -1192,7 +1192,7 @@ void IPV6Cidr::set(const char *cp)
char *ep;
memset(&netmask, 0, sizeof(netmask));
- bitset((bit_t *)&netmask, getMask(cp));
+ ::bitset((bit_t *)&netmask, getMask(cp));
setString(cbuf, sizeof(cbuf), cp);
ep = (char *)strchr(cp, '/');
if(ep)