Commit Graph

600 Commits

Author SHA1 Message Date
Luca Boccassi
7a2be6a3ab Merge pull request #164 from Zvax/patch-1
Update README
2017-10-10 14:46:07 +01:00
Félix Gagnon-Grenier
7d63737d0a Update README
So that confused people like me really have to understand this is another repository.
2017-10-10 09:38:45 -04:00
Luca Boccassi
ebae0a28d1 Merge pull request #163 from sigiesec/revert-162-revert-161-patch
Revert "Revert "Fix compile error for libzmq 4.2.1 and 4.2.2""
2017-10-10 12:50:02 +01:00
Simon Giesecke
af9a92e6a8 Revert "Revert "Fix compile error for libzmq 4.2.1 and 4.2.2"" 2017-10-10 13:42:50 +02:00
Luca Boccassi
4aa36ce296 Merge pull request #162 from sigiesec/revert-161-patch
Revert "Fix compile error for libzmq 4.2.1 and 4.2.2"
2017-10-09 15:22:03 +01:00
Simon Giesecke
8ec71c146a Revert "Fix compile error for libzmq 4.2.1 and 4.2.2 (#161)"
This reverts commit a1000a0dd6.
2017-10-09 16:10:44 +02:00
Frank van Kesteren
a1000a0dd6 Fix compile error for libzmq 4.2.1 and 4.2.2 (#161)
* Fix compile error for libzmq 4.2.1 and 4.2.2

When defined ZMQ_BUILD_DRAFT_API=1, you receive an error "'on_event_handshake_succeeded' was not declared in this scope"... which is correct for versions 4.2.1 and 4.2.2.
Function was renamed from 'on_event_handshake_succeed', fixed this by updating the function name.
2017-10-09 15:02:00 +01:00
Luca Boccassi
98fa1f41bf Merge pull request #160 from sigiesec/fix-monitoring
Problem: inconsistent symbol naming for ZMQ_VERSION>=4.2.3
2017-10-09 13:25:58 +01:00
Simon Giesecke
4a08086815 Problem: inconsistent symbol naming for ZMQ_VERSION>=4.2.3
Solution: use new on_event_* methods
2017-10-09 14:16:40 +02:00
Luca Boccassi
059e4b4d8d Merge pull request #159 from clouds56/master
fix libzmqPkgConfigFallback.cmake for find library in macOS and MinGW
2017-10-07 16:18:03 +01:00
Clouds Flowing
1e2682f1fe fix libzmqPkgConfigFallback.cmake for find library in macOS and MinGW 2017-10-07 22:58:12 +08:00
Luca Boccassi
845dbac8ef Merge pull request #154 from ivan-cukic/patch-1
Removing ambiguous overload of poll
2017-09-24 11:13:25 +01:00
Ivan Čukić
e93e9f9715 Removing ambiguous overload of poll
There are two overloads of `poll` - one that has `-1` as the default value for the timeout, and one that does not have the timeout argument (which calls the previous one with -1 for the timeout). This makes it ambiguous for the compiler when `poll` is called without the timeout.

This patch removes the second overload as it is not needed since the first one already covers the same case.
2017-09-24 11:24:29 +02:00
Luca Boccassi
33c0df11b6 Merge pull request #153 from sigiesec/adapt-poller
Problem: inconsistency with DRAFT APIs in libzmq 4.2.x
2017-09-20 12:21:12 +02:00
sigiesec
0cb94dc32d Problem: inconsistency DRAFT APIs in libzmq 4.2.x
Solution: distinguish cases for libzmq 4.2.0, 4.2.1/4.2.2 and 4.2.3
2017-09-20 12:15:14 +02:00
Lingpho
af523fad7d Fix #147 issuse (#150)
* add more DRAFT API, fix the #147 issue
2017-08-31 20:30:43 +01:00
Luca Boccassi
e85a7b981b Merge pull request #149 from sigiesec/revert-125-master
Revert "Fix rvalue for socket::send() on EHOSTUNREACH"
2017-08-29 11:09:01 +01:00
Simon Giesecke
a94e648495 Revert "Fix rvalue for socket::send() on EHOSTUNREACH" 2017-08-29 11:15:03 +02:00
Constantin Rack
0c249fc985 Merge pull request #146 from qsodev/peektypconst
changed peektyp() to const
2017-08-18 07:25:31 +02:00
Martl
a475c54529 changed peektyp() to const 2017-08-17 21:56:16 +02:00
Luca Boccassi
156cf8fa73 Merge pull request #145 from qsodev/fixcmakewarning
added QUIET to avoid false cmake warning (missing ZeroMQ)
2017-08-17 20:20:37 +01:00
Martl
4ad7a811f0 added QUIET to avoid false cmake warning (missing ZeroMQ) 2017-08-17 21:15:23 +02:00
Constantin Rack
8f56e3b522 Merge pull request #144 from qsodev/fixpeektyp
fixed peektyp check and return value
2017-08-17 21:12:28 +02:00
Martl
e6dd71e544 fixed peektyp check and return value 2017-08-17 21:03:36 +02:00
Luca Boccassi
d9f0f016c0 Problem: copyright years out of date
Solution: update them
List the ZeroMQ community as a shorthand for the full list of authors
as it can be found via git log
2017-07-31 14:30:55 +01:00
Luca Boccassi
a89d35b1ec Merge pull request #133 from ax3l/fix-pkgConfigAutotools
CMake: pkg-config Fallback
2017-07-20 17:13:30 +01:00
Axel Huebl
d1568bf1e9
Fix #121 CMake Min Version
CMake targets / interfaces need at least CMake 3.0
2017-07-19 10:43:07 +02:00
Axel Huebl
2008da35e6
Pkg-Config Fallback: File
move the new logic to a simple file so we
do not add code duplication
2017-07-18 20:15:41 +02:00
Axel Huebl
217985adf0
CMake: pkg-config Fallback
Try to find installs of `libzmq` that were performed with
autotools with a `pkg-config` fallback.
2017-07-18 14:39:41 +02:00
Luca Boccassi
749522d5bb Merge pull request #135 from juseless/patch-1
Update zmq.hpp
2017-07-17 10:30:59 +01:00
juseless
449a0141fb Update zmq.hpp
Line 706 constructor was:   
monitor_t() : socketPtr(NULL), monitor_socket{NULL} {}
but should be:
monitor_t() : socketPtr(NULL), monitor_socket(NULL) {}

Note change of bracket types for monitor_socket parameter.
2017-07-16 20:01:08 -04:00
Luca Boccassi
b8385630bc Merge pull request #134 from a4z/monitor
Problem: monitor_t::monitor function is blocking
2017-07-14 15:43:26 +01:00
a4z
d4da63fed6 Problem: monitor_t::monitor function is blocking
This does not allaw to use monitor_t without a thread.
What is often OK but sometimes not.

Solution:
keep existing interface but add a non blocking alternative.
2017-07-14 16:03:04 +02:00
Constantin Rack
b0e6d4bacd Merge pull request #131 from icyblade/icyblade-patch-1
typo fix
2017-07-07 09:55:58 +02:00
Icyblade Dai
7ef9813aee typo fix 2017-07-07 14:06:36 +08:00
Luca Boccassi
1bfb3addef Merge pull request #130 from a4z/movector
Problem: uninitialized context pointer in socket_t move constructor
2017-07-03 11:16:03 +01:00
a4z
d88414e435 Problem: uninitialized context pointer in socket_t move constructor
This can cause monitor_t to crash if used with a socket that was
constructed via the move constructor.

Solution: initialise the context pointer variable ctxptr in the move
constructor.
2017-07-03 10:35:19 +02:00
Stephen Eckels
37275e78f2 Updated readme to include build steps (#129)
* Updated readme to include build steps
2017-06-26 16:26:01 +01:00
Luca Boccassi
fc990f1419 Merge pull request #125 from msune/master
Fix rvalue for socket::send() on EHOSTUNREACH
2017-06-07 11:18:49 +01:00
Marc Sune
5363388fc5 Fix rvalue for socket::send() on EHOSTUNREACH
During introduction of EHOSTUNREACH, missing mapping between
EHOSTUNREACH errno and false/0 return code for socket's send()
calls was missing, throwing an exception.

To be consistent with the rest of wrappers (e.g. DONTWAIT), fix it
by handling this errno as a regular EAGAIN, and let the caller use
errno/zmq_errno() to branch on their code.
2017-06-07 12:09:02 +02:00
Luca Boccassi
b544d86c5f Merge pull request #124 from vtellier/patch-1
Added peekstr and peektyp methods
2017-06-07 09:29:03 +01:00
Vincent Tellier
0ffe2f4974 Added peekstr and peektyp methods
These methods peeks a part and return a copy of its value as a string or the specified type.
2017-06-07 09:54:37 +02:00
Luca Boccassi
0feae8c3e9 Merge pull request #120 from bjovke/master
Code formatting, sorry...
2017-04-09 21:23:51 +01:00
bjovke
46fc0572c5 Code formatting, sorry... 2017-04-09 22:16:35 +02:00
Luca Boccassi
bd1d53dbb5 Merge pull request #119 from bjovke/master
Allow for empty handler parameter in call to zmq::poller_t::add().
2017-04-09 20:50:37 +01:00
bjovke
d9a0fde681 Allow for empty handler parameter (empty std::function()) in call to zmq::poller_t::add(). 2017-04-09 21:34:16 +02:00
Luca Boccassi
e84484c34c Merge pull request #118 from herbrechtsmeier/cmake
cmake: Export targets to package config
2017-04-05 10:51:20 +01:00
Stefan Herbrechtsmeier
aa850e7ec2 cmake: Export targets to package config
Export CMake targets to package config via interface libraries. This
allows the user to simple depends on this project and thereby gets
the additionally dependencies like ZeroMQ automatically.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2017-04-05 11:10:18 +02:00
Luca Boccassi
1fdf3d1dfe Merge pull request #114 from jgornowich/master
update directive for ZMQ_MAKE_VERSION check against zmq_msg_gets method
2017-02-20 13:18:27 +00:00
John Gornowich
2def369043 update directive for ZMQ_MAKE_VERSION check against zmq_msg_gets method 2017-02-20 08:04:02 -05:00