generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-07 22:40:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into monitor-regressions

Browse Source
This commit is contained in:
Lourens Naudé
2012-05-22 23:35:30 +01:00
parent 991b7fcc04 20152a6e3e
commit adf7a7ade1
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/zmq.txt
View File

@@ -19,7 +19,7 @@ DESCRIPTION
The 0MQ lightweight messaging kernel is a library which extends the standard The 0MQ lightweight messaging kernel is a library which extends the standard
socket interfaces with features traditionally provided by specialised socket interfaces with features traditionally provided by specialised
_messaging middleware_ products. 0MQ sockets provide an abstraction of _messaging middleware_ products. 0MQ sockets provide an abstraction of
asynchronous _message queues_, multiple _messaging patterns_, message asynchronous _message queues_, multiple _messaging patterns_, message
filtering (_subscriptions_), seamless access to multiple _transport protocols_ filtering (_subscriptions_), seamless access to multiple _transport protocols_
and more. and more.
@@ -211,8 +211,8 @@ by C programmers. The intent is that programmers using 0MQ from other languages
shall refer to this documentation alongside any documentation provided by the shall refer to this documentation alongside any documentation provided by the
vendor of their language binding. vendor of their language binding.
Language bindings (Python, PHP, Ruby, Java and more) are provided by members Language bindings ($$C++$$, Python, PHP, Ruby, Java and more) are provided by
of the 0MQ community and pointers can be found on the 0MQ website. members of the 0MQ community and pointers can be found on the 0MQ website.
AUTHORS AUTHORS

2
doc/zmq_ctx_new.txt
View File

@@ -39,7 +39,7 @@ No error values are defined for this function.
SEE ALSO SEE ALSO
-------- --------
linkzmq:zmq[7] linkzmq:zmq[7]
linkzmq:zmq_ctx_put[3] linkzmq:zmq_ctx_set[3]
linkzmq:zmq_ctx_get[3] linkzmq:zmq_ctx_get[3]
linkzmq:zmq_ctx_destroy[3] linkzmq:zmq_ctx_destroy[3]

3
doc/zmq_pgm.txt
View File

@@ -60,7 +60,8 @@ An 'interface' may be specified by either of the following:
NOTE: Interface names are not standardised in any way and should be assumed to NOTE: Interface names are not standardised in any way and should be assumed to
be arbitrary and platform dependent. On Win32 platforms no short interface be arbitrary and platform dependent. On Win32 platforms no short interface
names exist, thus only the primary IPv4 address may be used to specify an names exist, thus only the primary IPv4 address may be used to specify an
'interface'. 'interface'. The 'interface' part can be omitted, in that case the default one
will be selected.
A 'multicast address' is specified by an IPv4 multicast address in it's numeric A 'multicast address' is specified by an IPv4 multicast address in it's numeric
representation. representation.

2
src/socket_base.cpp
View File

@@ -547,7 +547,7 @@ void zmq::socket_base_t::add_endpoint (const char *addr_, own_t *endpoint_)
{ {
// Activate the session. Make it a child of this socket. // Activate the session. Make it a child of this socket.
launch_child (endpoint_); launch_child (endpoint_);
endpoints.insert (std::make_pair (std::string (addr_), endpoint_)); endpoints.insert (endpoints_t::value_type (std::string (addr_), endpoint_));
} }
int zmq::socket_base_t::term_endpoint (const char *addr_) int zmq::socket_base_t::term_endpoint (const char *addr_)