generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-05 03:37:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix non-constant-expression narrowing

Browse Source 
For OS X, the microseconds field is implemented as an int type. The implicit narrowing in the initializer list throws a compiler error for some compilers with C++11 support turned on. The specific error message is: "error: non-constant-expression cannot be narrowed from type 'long' to '__darwin_suseconds_t' (aka 'int') in initializer list [-Wc++11-narrowing]".

Tested on Clang 5.1.0 and Mac OS X 10.9.4.
This commit is contained in:
Huu Nguyen 2014-09-16 14:27:00 -07:00
parent 4b70793f1f
commit 5642366f10
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/select.cpp
View File

@ -163,8 +163,12 @@ void zmq::select_t::loop ()
memcpy (&exceptfds, &source_set_err, sizeof source_set_err); memcpy (&exceptfds, &source_set_err, sizeof source_set_err);
// Wait for events. // Wait for events.
#ifdef ZMQ_HAVE_OSX
struct timeval tv = {(long) (timeout / 1000), timeout % 1000 * 1000};
#else
struct timeval tv = {(long) (timeout / 1000), struct timeval tv = {(long) (timeout / 1000),
(long) (timeout % 1000 * 1000)}; (long) (timeout % 1000 * 1000)};
#endif
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
int rc = select (0, &readfds, &writefds, &exceptfds, int rc = select (0, &readfds, &writefds, &exceptfds,
timeout ? &tv : NULL); timeout ? &tv : NULL);