From ece244dd3c4ce1f57b62557e664d0d47f82ac625 Mon Sep 17 00:00:00 2001 From: Patrick Bos Date: Thu, 10 Jun 2021 12:23:22 +0200 Subject: [PATCH 1/2] fix unused parameter warning when POLL_BASED_ON_SELECT When the build is performed with cmake option `-DPOLLER=select`, the following warning is triggered from 4 locations that import `polling_util.hpp`: ``` [...]/src/polling_util.hpp:115:50: warning: unused parameter 'pollset_' [-Wunused-parameter] inline size_t valid_pollset_bytes (const fd_set &pollset_) ^ 1 warning generated. ``` This is fixed here. --- src/polling_util.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/polling_util.hpp b/src/polling_util.hpp index 5d2af31e5c..b6d4050e08 100644 --- a/src/polling_util.hpp +++ b/src/polling_util.hpp @@ -109,9 +109,9 @@ timeout_t compute_timeout (bool first_pass_, long timeout_, uint64_t now_, uint64_t end_); #elif defined ZMQ_POLL_BASED_ON_SELECT +#if defined ZMQ_HAVE_WINDOWS inline size_t valid_pollset_bytes (const fd_set &pollset_) { -#if defined ZMQ_HAVE_WINDOWS // On Windows we don't need to copy the whole fd_set. // SOCKETS are continuous from the beginning of fd_array in fd_set. // We just need to copy fd_count elements of fd_array. @@ -119,10 +119,14 @@ inline size_t valid_pollset_bytes (const fd_set &pollset_) return reinterpret_cast ( &pollset_.fd_array[pollset_.fd_count]) - reinterpret_cast (&pollset_); +} #else +inline size_t valid_pollset_bytes (const fd_set &/*pollset_*/) +{ return sizeof (fd_set); -#endif } +#endif + #if defined ZMQ_HAVE_WINDOWS // struct fd_set { From 535bc2abb84084419d73ac400b280ec91e4c91ad Mon Sep 17 00:00:00 2001 From: "E. G. Patrick Bos" Date: Tue, 15 Jun 2021 17:39:02 +0200 Subject: [PATCH 2/2] add relicense statement for egpbos Copyright of the Netherlands eScience Center. --- RELICENSE/NLeScienceCenter.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 RELICENSE/NLeScienceCenter.md diff --git a/RELICENSE/NLeScienceCenter.md b/RELICENSE/NLeScienceCenter.md new file mode 100644 index 0000000000..7623c1cbae --- /dev/null +++ b/RELICENSE/NLeScienceCenter.md @@ -0,0 +1,13 @@ +# Permission to Relicense under MPLv2 + +This is a statement by the Netherlands eScience Center +that grants permission to relicense its copyrights in the libzmq C++ +library (ZeroMQ) under the Mozilla Public License v2 (MPLv2). + +A portion of the commits made by the Github handle "egpbos", with +commit author "E. G. Patrick Bos p.bos@esciencecenter.nl", are copyright of the Netherlands eScience Center. +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +Rob van Nieuwpoort +2021/06/15