From c802a72a0b4aae06cd65158af3c65e65e0dfc2e0 Mon Sep 17 00:00:00 2001 From: Vitaly Mayatskikh Date: Mon, 22 Mar 2010 22:31:37 +0100 Subject: configure does not mention xmlto when missing --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 36f95a8..eb36f8f 100644 --- a/configure.in +++ b/configure.in @@ -84,7 +84,7 @@ if test -d ".git"; then if test "x$have_asciidoc" = "xno" -o "x$have_xmlto" = "xno"; then build_doc="no" install_man="no" - AC_MSG_WARN([You are building from git and asciidoc is not installed. Documentation will not be built or installed.]) + AC_MSG_WARN([You are building from git and asciidoc or xmlto is not installed. Documentation will not be built or installed.]) else build_doc="yes" fi -- cgit v1.2.3 From 783463ac49aeb2d1be57dc9b3669d508187415a8 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Thu, 25 Mar 2010 17:31:18 +0100 Subject: Clarify use of poll() with C++ API, fix typo --- doc/zmq_cpp.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/zmq_cpp.txt b/doc/zmq_cpp.txt index 19467d9..c12c834 100644 --- a/doc/zmq_cpp.txt +++ b/doc/zmq_cpp.txt @@ -117,7 +117,7 @@ Constructor These map to the _zmq_msg_init()_, _zmq_msg_init_size()_ and _zmq_msg_init_data()_ functions, described in linkzmq:zmq_msg_init[3], -linkzmq:zmq_msg_init_size[3] and linkzmq_msg_init_data[3] respectively. +linkzmq:zmq_msg_init_size[3] and linkzmq:zmq_msg_init_data[3] respectively. Destructor @@ -164,6 +164,9 @@ Input/output multiplexing The _poll()_ function is a namespaced equivalent of the _zmq_poll()_ function, as described in linkzmq:zmq_poll[3]. +NOTE: To obtain a 0MQ _socket_ for use in a _zmq_pollitem_t_ structure, you +should cast an instance of the _socket_t_ class to `(void *)`. + ERROR HANDLING -------------- -- cgit v1.2.3