summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-12-19 13:33:43 +0000
committerjoerg <joerg@pkgsrc.org>2016-12-19 13:33:43 +0000
commitde7a17f70404258b1b973c9b8b40f54fa24ecf38 (patch)
tree86a8c4febbab5229675450138966aeee2ba6a35a
parent09e9b954b652ee8a6dc6b3fd118197d7ab5cb85f (diff)
downloadpkgsrc-de7a17f70404258b1b973c9b8b40f54fa24ecf38.tar.gz
Fix access to protected members.
-rw-r--r--devel/ucommon/distinfo3
-rw-r--r--devel/ucommon/patches/patch-inc_ucommon_thread.h15
2 files changed, 17 insertions, 1 deletions
diff --git a/devel/ucommon/distinfo b/devel/ucommon/distinfo
index 314541ce356..f7bda4d8c7f 100644
--- a/devel/ucommon/distinfo
+++ b/devel/ucommon/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 03:29:37 agc Exp $
+$NetBSD: distinfo,v 1.12 2016/12/19 13:33:43 joerg Exp $
SHA1 (ucommon-6.3.1.tar.gz) = 82db4fda4b11589b0b02a2afb07a4f675edacfb9
RMD160 (ucommon-6.3.1.tar.gz) = b58ac6dcd7b5e88fdc2e38703cddc9afd17175bf
@@ -7,4 +7,5 @@ Size (ucommon-6.3.1.tar.gz) = 830661 bytes
SHA1 (patch-commoncpp_tcp.cpp) = 312c1b4ee234852dcecb0ba2fbdf8813e7ca1704
SHA1 (patch-commoncpp_udp.cpp) = 34607048d74a0c0142334179e43f481aa4affab7
SHA1 (patch-configure) = 13335dcb186aa37a12e8dafcf64c077ccc543819
+SHA1 (patch-inc_ucommon_thread.h) = 7e90ba09c05e2d1e41525eb078add93746bf8a2d
SHA1 (patch-utils_keywait.cpp) = 003bc190393f0b1c3e052605136ef9cf50bddc40
diff --git a/devel/ucommon/patches/patch-inc_ucommon_thread.h b/devel/ucommon/patches/patch-inc_ucommon_thread.h
new file mode 100644
index 00000000000..aaf1df20343
--- /dev/null
+++ b/devel/ucommon/patches/patch-inc_ucommon_thread.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-inc_ucommon_thread.h,v 1.1 2016/12/19 13:33:43 joerg Exp $
+
+Friendship is not inherited.
+
+--- inc/ucommon/thread.h.orig 2016-12-18 09:48:45.932481633 +0000
++++ inc/ucommon/thread.h
+@@ -1252,6 +1252,8 @@ class __EXPORT SharedPointer : protected
+ {
+ private:
+ friend class shared_release;
++ template<class T> friend class shared_instance;
++
+ SharedObject *pointer;
+
+ protected: