summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--doc/zmq_cpp.txt5
2 files changed, 5 insertions, 2 deletions
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
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
--------------