3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-13 01:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4211 from egpbos/patch-1

Browse Source 
fix unused parameter warning when POLL_BASED_ON_SELECT
This commit is contained in:
Luca Boccassi 2021-06-15 19:21:01 +01:00 committed by GitHub
commit 9b2e1fa26c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
RELICENSE/NLeScienceCenter.md Normal file
View File

@ -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 <R.vanNieuwpoort@esciencecenter.nl>
2021/06/15

12
src/polling_util.hpp
View File

@ -109,9 +109,9 @@ timeout_t
compute_timeout (bool first_pass_, long timeout_, uint64_t now_, uint64_t end_); compute_timeout (bool first_pass_, long timeout_, uint64_t now_, uint64_t end_);
#elif defined ZMQ_POLL_BASED_ON_SELECT #elif defined ZMQ_POLL_BASED_ON_SELECT
#if defined ZMQ_HAVE_WINDOWS
inline size_t valid_pollset_bytes (const fd_set &pollset_) 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. // On Windows we don't need to copy the whole fd_set.
// SOCKETS are continuous from the beginning of fd_array in 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. // 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<const char *> ( return reinterpret_cast<const char *> (
&pollset_.fd_array[pollset_.fd_count]) &pollset_.fd_array[pollset_.fd_count])
- reinterpret_cast<const char *> (&pollset_); - reinterpret_cast<const char *> (&pollset_);
#else
return sizeof (fd_set);
#endif
} }
#else
inline size_t valid_pollset_bytes (const fd_set &/*pollset_*/)
{
return sizeof (fd_set);
}
#endif
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
// struct fd_set { // struct fd_set {