Commit Graph

222 Commits

Author SHA1 Message Date
Simon Giesecke
7a8cc9d7cf Problem: version detection broken, confuses libzmq and cppzmq versions
Solution: Fix version detection and cmake syntax errors
Fixes #182
2018-03-28 12:58:12 +02:00
Simon Giesecke
702d2fcf53 Problem: no CI for cppzmq
Solution: add travis-ci
2018-03-28 12:54:07 +02:00
Luca Boccassi
52c606ed86
Merge pull request #190 from sigiesec/fix-poller-api-error-handling
Fix copy/move constructors of poller_t, and make error handling consistent with rest of API
2018-03-26 16:21:42 +01:00
sigiesec
608613217e Problem: inconsistent error handling in poller_t
Solution: make poller_t::add and poller_t::remove throw error_t on error, return void
2018-03-26 16:59:47 +02:00
sigiesec
16a76513e3 Problem: poller_t is copyable, but does not implement copying properly
Solution: make poller_t non-copyable, but properly movable
2018-03-26 16:58:13 +02:00
Luca Boccassi
84ab7a0fc6
Merge pull request #187 from cowo78/master
std::string conversion for zmq::message_t
2018-03-07 13:25:59 +00:00
Giuseppe Corbelli
0d1c20e2ea Consistently indented some preprocessor directives.
Added a str() method and companion operator<<(std::ostream) similar to multipart_t.
Added some comments to mark the end of preprocessor instructions / class def / namespace def.
2018-03-07 14:14:09 +01:00
Giuseppe Corbelli
f945a7d032 Added an operator<<(std::ostream) to easily print out multipart_t contents using already defined str() method.
Added some comments to mark the end of preprocessor instructions / class def / namespace def
2018-03-07 14:11:41 +01:00
Luca Boccassi
a96e0ded64
Merge pull request #181 from WRidder/master
Added wrapper for context options
2018-01-28 10:58:18 +00:00
Wilbert van de Ridder
59f7d1ca2f Added wrapper for context options 2018-01-27 19:14:35 +01:00
Luca Boccassi
25dbe96b86
Merge pull request #179 from jianhuachentw/master
fix installation source path of FindZeroMQ.cmake
2018-01-16 09:19:28 +00:00
Jian-Hua Chen
4367591ad6 fix installation source path of FindZeroMQ.cmake
when cppzmq is not the root folder of cmake (i.e., it is embedded in a
super project), CMAKE_SOURCE_DIR will not be the correct path to copy
FindZeroMQ.cmake.
2018-01-16 16:13:02 +08:00
Luca Boccassi
e2f91c06f6
Merge pull request #178 from minrk/rm-duplicate-find
fix updated FindZeroMQ
2018-01-15 19:24:23 +00:00
Min RK
8b92cb82aa fix updated FindZeroMQ
- remove duplicate top-level install
- copy fallback code to cppzmqConfig.cmake.in
2018-01-15 10:43:00 -08:00
Constantin Rack
6aa3ab686e
Merge pull request #174 from minrk/findzeromq
call pkg-config fallback FindZeroMQ.cmake
2018-01-14 05:41:41 +01:00
Min RK
f4c0c5e6a3 call pkg-config fallback FindZeroMQ.cmake
and add it to CMAKE_MODULE_PATH on failed load

this allows downstream packages that have loaded cppzmq to call find_package(ZeroMQ) and succeed without shipping their own copy of the fallback.

Additionally, a check for if the libzmq target is defined avoids duplicate definitions when called multiple times
2018-01-13 14:13:38 -08:00
Luca Boccassi
249b4a09a7
Merge pull request #170 from NAIVEddd/patch-1
Reduce the duplication.
2017-11-03 10:06:44 +00:00
NAIVEddd
d28e13115d
Reduce the duplication. 2017-11-03 13:12:52 +08:00
Luca Boccassi
276f1b91c7 Merge pull request #168 from sigiesec/patch-1
Problem: implicit type conversion warning
2017-10-25 09:15:55 +01:00
Simon Giesecke
e325495a39 Problem: implicit type conversion warning
Solution: Added explicit static_cast
2017-10-25 10:13:07 +02:00
Constantin Rack
8055314722 Merge pull request #165 from Zvax/patch-2
Markdowning the README
2017-10-10 23:35:49 +02:00
Félix Gagnon-Grenier
f1ce18169f Markdowning the README 2017-10-10 17:15:28 -04:00
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