diff options
| author | joerg <joerg> | 2013-04-29 21:19:14 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-04-29 21:19:14 +0000 |
| commit | 329440bb0e9fba8f7feda5086e2617d3a3d94189 (patch) | |
| tree | f706da8d879403bf9af75c1bf881f33a0e8f65f1 /devel | |
| parent | 2f888e8606b502adbe0179e99572ee2606005571 (diff) | |
| download | pkgsrc-329440bb0e9fba8f7feda5086e2617d3a3d94189.tar.gz | |
Be explicit that the local version of bitset is wanted, not the STL
version in std for C++11 libraries.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ucommon/distinfo | 3 | ||||
| -rw-r--r-- | devel/ucommon/patches/patch-commoncpp_address.cpp | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/devel/ucommon/distinfo b/devel/ucommon/distinfo index 7425c84b046..ecad237ba95 100644 --- a/devel/ucommon/distinfo +++ b/devel/ucommon/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2013/04/17 00:51:20 rodent Exp $ +$NetBSD: distinfo,v 1.2 2013/04/29 21:19:14 joerg Exp $ SHA1 (ucommon-6.0.3.tar.gz) = e3263fe7bb8a37dc00a227218c62a5040ccaf465 RMD160 (ucommon-6.0.3.tar.gz) = 4debf5f5c31a6162b9d60041ddb44ca385336f3b Size (ucommon-6.0.3.tar.gz) = 806841 bytes SHA1 (patch-CMakeLists.txt) = 4d4c11a89111161bc8d8fe3715f643290ecb6149 +SHA1 (patch-commoncpp_address.cpp) = 6eedbed1c3095362a00eea581917152de9ca6852 diff --git a/devel/ucommon/patches/patch-commoncpp_address.cpp b/devel/ucommon/patches/patch-commoncpp_address.cpp new file mode 100644 index 00000000000..4c7f8730948 --- /dev/null +++ b/devel/ucommon/patches/patch-commoncpp_address.cpp @@ -0,0 +1,22 @@ +$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) |