diff options
| author | malosek <malosek@fastmq.com> | 2010-01-05 11:05:03 +0100 |
|---|---|---|
| committer | malosek <malosek@fastmq.com> | 2010-01-05 11:05:03 +0100 |
| commit | 472ddf8de2c93f750831d52b5473cdbed1db51e8 (patch) | |
| tree | 476650afd868502a5a023599910c5415fdc57fe6 | |
| parent | d10c605fa94a8fe8265785043aeef63983e07f3f (diff) | |
| parent | 4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff) | |
fixed failed merge with autogen.sh
184 files changed, 216 insertions, 194 deletions
@@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # @@ -31,10 +31,13 @@ if [ $? -ne 0 ]; then echo echo "Cannot create config directory." echo + exit 1 fi + autoreconf --install --force --verbose -I config if [ $? -ne 0 ]; then echo echo "Could not run autoreconf, check autotools installation." echo + exit 1 fi diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h index 7d3544e..3bcee9d 100644 --- a/bindings/c/zmq.h +++ b/bindings/c/zmq.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -202,7 +202,7 @@ typedef struct short revents; } zmq_pollitem_t; -ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems); +ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout); //////////////////////////////////////////////////////////////////////////////// // Helper functions. diff --git a/bindings/cpp/zmq.hpp b/bindings/cpp/zmq.hpp index 4349f0b..a572c69 100644 --- a/bindings/cpp/zmq.hpp +++ b/bindings/cpp/zmq.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -33,9 +33,9 @@ namespace zmq typedef zmq_free_fn free_fn; typedef zmq_pollitem_t pollitem_t; - inline int poll (zmq_pollitem_t *items_, int nitems_) + inline int poll (zmq_pollitem_t *items_, int nitems_, long timeout_ = -1) { - return zmq_poll (items_, nitems_); + return zmq_poll (items_, nitems_, timeout_); } class error_t : public std::exception diff --git a/bindings/java/Context.cpp b/bindings/java/Context.cpp index 652a120..f3f74ff 100644 --- a/bindings/java/Context.cpp +++ b/bindings/java/Context.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/java/Socket.cpp b/bindings/java/Socket.cpp index 26c6003..eaf1b22 100644 --- a/bindings/java/Socket.cpp +++ b/bindings/java/Socket.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/java/org/zmq/Context.java b/bindings/java/org/zmq/Context.java index 408c6b0..3c00ba8 100644 --- a/bindings/java/org/zmq/Context.java +++ b/bindings/java/org/zmq/Context.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/java/org/zmq/Socket.java b/bindings/java/org/zmq/Socket.java index 075e322..1b427c3 100644 --- a/bindings/java/org/zmq/Socket.java +++ b/bindings/java/org/zmq/Socket.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/python/pyzmq.cpp b/bindings/python/pyzmq.cpp index 425effe..7a53c8e 100644 --- a/bindings/python/pyzmq.cpp +++ b/bindings/python/pyzmq.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb index f931c5e..d5778d0 100644 --- a/bindings/ruby/extconf.rb +++ b/bindings/ruby/extconf.rb @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/bindings/ruby/rbzmq.cpp b/bindings/ruby/rbzmq.cpp index 10ff55f..fce749c 100644 --- a/bindings/ruby/rbzmq.cpp +++ b/bindings/ruby/rbzmq.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/builds/msvc/platform.hpp b/builds/msvc/platform.hpp index 0555fa3..483f88f 100644 --- a/builds/msvc/platform.hpp +++ b/builds/msvc/platform.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/devices/zmq_forwarder/zmq_forwarder.cpp b/devices/zmq_forwarder/zmq_forwarder.cpp index 277af72..42d65b4 100644 --- a/devices/zmq_forwarder/zmq_forwarder.cpp +++ b/devices/zmq_forwarder/zmq_forwarder.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/devices/zmq_queue/zmq_queue.cpp b/devices/zmq_queue/zmq_queue.cpp index 78ccd2d..a90aac7 100644 --- a/devices/zmq_queue/zmq_queue.cpp +++ b/devices/zmq_queue/zmq_queue.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/devices/zmq_streamer/zmq_streamer.cpp b/devices/zmq_streamer/zmq_streamer.cpp index c1b88ec..a2906d9 100644 --- a/devices/zmq_streamer/zmq_streamer.cpp +++ b/devices/zmq_streamer/zmq_streamer.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/examples/chat/display.cpp b/examples/chat/display.cpp index d04e90b..d3488a2 100755 --- a/examples/chat/display.cpp +++ b/examples/chat/display.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/examples/chat/prompt.cpp b/examples/chat/prompt.cpp index 72b0195..540ac16 100644 --- a/examples/chat/prompt.cpp +++ b/examples/chat/prompt.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/man/convert2pdf.sh b/man/convert2pdf.sh index 8f41e0e..f8ab00c 100755 --- a/man/convert2pdf.sh +++ b/man/convert2pdf.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/man/man1/zmq_forwarder.1 b/man/man1/zmq_forwarder.1 index 610767a..b45d9c8 100644 --- a/man/man1/zmq_forwarder.1 +++ b/man/man1/zmq_forwarder.1 @@ -1,4 +1,4 @@ -.TH zmq_forwarder 1 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_forwarder 1 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_forwarder \- forwards the stream of PUB/SUB messages .SH SYNOPSIS diff --git a/man/man1/zmq_queue.1 b/man/man1/zmq_queue.1 index 25aeab6..da29d86 100644 --- a/man/man1/zmq_queue.1 +++ b/man/man1/zmq_queue.1 @@ -1,4 +1,4 @@ -.TH zmq_queue 1 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_queue 1 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_queue \- forwards REQ/REP messages .SH SYNOPSIS diff --git a/man/man1/zmq_streamer.1 b/man/man1/zmq_streamer.1 index 34b837b..deadc65 100644 --- a/man/man1/zmq_streamer.1 +++ b/man/man1/zmq_streamer.1 @@ -1,4 +1,4 @@ -.TH zmq_streamer 1 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_streamer 1 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_streamer \- forwards the stream of UPSTREAM/DOWNSTREAM messages .SH SYNOPSIS diff --git a/man/man3/zmq_bind.3 b/man/man3/zmq_bind.3 index 069b966..c4d955e 100644 --- a/man/man3/zmq_bind.3 +++ b/man/man3/zmq_bind.3 @@ -1,4 +1,4 @@ -.TH zmq_bind 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_bind 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_bind \- binds the socket to the specified address .SH SYNOPSIS diff --git a/man/man3/zmq_close.3 b/man/man3/zmq_close.3 index cc49635..b2a9274 100644 --- a/man/man3/zmq_close.3 +++ b/man/man3/zmq_close.3 @@ -1,4 +1,4 @@ -.TH zmq_close 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_close 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_close \- destroys 0MQ socket .SH SYNOPSIS diff --git a/man/man3/zmq_connect.3 b/man/man3/zmq_connect.3 index 8f09e20..5824a80 100644 --- a/man/man3/zmq_connect.3 +++ b/man/man3/zmq_connect.3 @@ -1,4 +1,4 @@ -.TH zmq_connect 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_connect 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_connect \- connect the socket to the specified peer .SH SYNOPSIS diff --git a/man/man3/zmq_flush.3 b/man/man3/zmq_flush.3 index 194cf6c..eb2a719 100644 --- a/man/man3/zmq_flush.3 +++ b/man/man3/zmq_flush.3 @@ -1,4 +1,4 @@ -.TH zmq_flush 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_flush 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_flush \- flushes pre-sent messages to the socket .SH SYNOPSIS diff --git a/man/man3/zmq_init.3 b/man/man3/zmq_init.3 index f4f7076..6b5e75f 100644 --- a/man/man3/zmq_init.3 +++ b/man/man3/zmq_init.3 @@ -1,4 +1,4 @@ -.TH zmq_init 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_init 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_init \- initialises 0MQ context .SH SYNOPSIS diff --git a/man/man3/zmq_msg_close.3 b/man/man3/zmq_msg_close.3 index 6613360..e601ea2 100644 --- a/man/man3/zmq_msg_close.3 +++ b/man/man3/zmq_msg_close.3 @@ -1,4 +1,4 @@ -.TH zmq_msg_close 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_msg_close 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_msg_close \- destroys 0MQ message .SH SYNOPSIS diff --git a/man/man3/zmq_msg_copy.3 b/man/man3/zmq_msg_copy.3 index 2f70400..acb8389 100644 --- a/man/man3/zmq_msg_copy.3 +++ b/man/man3/zmq_msg_copy.3 @@ -1,4 +1,4 @@ -.TH zmq_msg_copy 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_msg_copy 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_msg_copy \- copies content of a message to another message .SH SYNOPSIS diff --git a/man/man3/zmq_msg_data.3 b/man/man3/zmq_msg_data.3 index 9876378..ef3cba8 100644 --- a/man/man3/zmq_msg_data.3 +++ b/man/man3/zmq_msg_data.3 @@ -1,4 +1,4 @@ -.TH zmq_msg_data 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_msg_data 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_msg_data \- retrieves pointer to the message content .SH SYNOPSIS diff --git a/man/man3/zmq_msg_init.3 b/man/man3/zmq_msg_init.3 index a531fc1..80d51d2 100644 --- a/man/man3/zmq_msg_init.3 +++ b/man/man3/zmq_msg_init.3 @@ -1,4 +1,4 @@ -.TH zmq_msg_init 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_msg_init 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_msg_init \- initialises empty 0MQ message .SH SYNOPSIS diff --git a/man/man3/zmq_msg_init_data.3 b/man/man3/zmq_msg_init_data.3 index 8b51c2b..0af95be 100644 --- a/man/man3/zmq_msg_init_data.3 +++ b/man/man3/zmq_msg_init_data.3 @@ -1,4 +1,4 @@ -.TH zmq_msg_init_data 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_msg_init_data 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_msg_init \- initialises 0MQ message from the given data .SH SYNOPSIS diff --git a/man/man3/zmq_msg_init_size.3 b/man/man3/zmq_msg_init_size.3 index ce1ec94..cc7a71e 100644 --- a/man/man3/zmq_msg_init_size.3 +++ b/man/man3/zmq_msg_init_size.3 @@ -1,4 +1,4 @@ -.TH zmq_msg_init_size 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_msg_init_size 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_msg_init \- initialises 0MQ message of a specified size .SH SYNOPSIS diff --git a/man/man3/zmq_msg_move.3 b/man/man3/zmq_msg_move.3 index 810e105..8663585 100644 --- a/man/man3/zmq_msg_move.3 +++ b/man/man3/zmq_msg_move.3 @@ -1,4 +1,4 @@ -.TH zmq_msg_move 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_msg_move 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_msg_move \- moves content of a message to another message .SH SYNOPSIS diff --git a/man/man3/zmq_msg_size.3 b/man/man3/zmq_msg_size.3 index b51d582..aa1f8b0 100644 --- a/man/man3/zmq_msg_size.3 +++ b/man/man3/zmq_msg_size.3 @@ -1,4 +1,4 @@ -.TH zmq_msg_size 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_msg_size 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_msg_size \- retrieves size of the message content .SH SYNOPSIS diff --git a/man/man3/zmq_poll.3 b/man/man3/zmq_poll.3 index 9782691..f70bf18 100644 --- a/man/man3/zmq_poll.3 +++ b/man/man3/zmq_poll.3 @@ -1,8 +1,8 @@ -.TH zmq_poll 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_poll 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_poll \- polls for events on a set of 0MQ and POSIX sockets .SH SYNOPSIS -.B int zmq_poll (zmq_pollitem_t *items, int nitems); +.B int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout); .SH DESCRIPTION Waits for the events specified by .IR items @@ -31,7 +31,7 @@ specifies which events to wait for. It's a combination of the values below. Once the call exits, .IR revent will be filled with events that have actually occured on the socket. The field -will contain a combination of the following values. +will contain a combination of the values below. .IP "\fBZMQ_POLLIN\fP" poll for incoming messages. @@ -40,6 +40,12 @@ wait while message can be set socket. Poll will return if a message of at least one byte can be written to the socket. However, there is no guarantee that arbitrarily large message can be sent. +.IR timeout +argument specifies an upper limit on the time for which +.IR zmq_poll +will block, in microseconds. Specifying a negative value in timeout means +an infinite timeout. + .SH RETURN VALUE Function returns number of items signaled or -1 in the case of error. .SH ERRORS diff --git a/man/man3/zmq_recv.3 b/man/man3/zmq_recv.3 index d3cf2fd..37d43d9 100644 --- a/man/man3/zmq_recv.3 +++ b/man/man3/zmq_recv.3 @@ -1,4 +1,4 @@ -.TH zmq_recv 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_recv 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_recv \- retrieves a message from the socket .SH SYNOPSIS diff --git a/man/man3/zmq_send.3 b/man/man3/zmq_send.3 index 0ebbd0c..4924ce0 100644 --- a/man/man3/zmq_send.3 +++ b/man/man3/zmq_send.3 @@ -1,4 +1,4 @@ -.TH zmq_send 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_send 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_send \- sends a message .SH SYNOPSIS diff --git a/man/man3/zmq_setsockopt.3 b/man/man3/zmq_setsockopt.3 index 36b7f08..ffbd345 100644 --- a/man/man3/zmq_setsockopt.3 +++ b/man/man3/zmq_setsockopt.3 @@ -1,4 +1,4 @@ -.TH zmq_setsockopt 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_setsockopt 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_setsockopt \- sets a specified option on a 0MQ socket .SH SYNOPSIS diff --git a/man/man3/zmq_socket.3 b/man/man3/zmq_socket.3 index de32d5f..9eb77c8 100644 --- a/man/man3/zmq_socket.3 +++ b/man/man3/zmq_socket.3 @@ -1,4 +1,4 @@ -.TH zmq_socket 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_socket 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_socket \- creates 0MQ socket .SH SYNOPSIS diff --git a/man/man3/zmq_strerror.3 b/man/man3/zmq_strerror.3 index 343c3ed..1ee2efe 100644 --- a/man/man3/zmq_strerror.3 +++ b/man/man3/zmq_strerror.3 @@ -1,4 +1,4 @@ -.TH zmq_strerror 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_strerror 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_strerror \- returns string describing the error number .SH SYNOPSIS diff --git a/man/man3/zmq_term.3 b/man/man3/zmq_term.3 index 8d822b6..92b4b37 100644 --- a/man/man3/zmq_term.3 +++ b/man/man3/zmq_term.3 @@ -1,4 +1,4 @@ -.TH zmq_term 3 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_term 3 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME zmq_init \- terminates 0MQ context .SH SYNOPSIS diff --git a/man/man7/zmq.7 b/man/man7/zmq.7 index 584c9ce..740726c 100644 --- a/man/man7/zmq.7 +++ b/man/man7/zmq.7 @@ -1,4 +1,4 @@ -.TH zmq 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME 0MQ \- a lightweight messaging kernel .SH SYNOPSIS diff --git a/man/man7/zmq_cl.7 b/man/man7/zmq_cl.7 index b9dd14f..c4f0162 100644 --- a/man/man7/zmq_cl.7 +++ b/man/man7/zmq_cl.7 @@ -1,4 +1,4 @@ -.TH zmq_cl 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_cl 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME Common Lisp API for 0MQ lightweight messaging kernel .SH SYNOPSIS diff --git a/man/man7/zmq_cpp.7 b/man/man7/zmq_cpp.7 index bcadab9..4df9157 100644 --- a/man/man7/zmq_cpp.7 +++ b/man/man7/zmq_cpp.7 @@ -1,4 +1,4 @@ -.TH zmq_cpp 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_cpp 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME C++ API for 0MQ lightweight messaging kernel .SH SYNOPSIS diff --git a/man/man7/zmq_inproc.7 b/man/man7/zmq_inproc.7 index 63779d9..7f43ca7 100644 --- a/man/man7/zmq_inproc.7 +++ b/man/man7/zmq_inproc.7 @@ -1,4 +1,4 @@ -.TH zmq_inproc 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_inproc 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME In-process (inter-thread) tranport for 0MQ .SH SYNOPSIS diff --git a/man/man7/zmq_pgm.7 b/man/man7/zmq_pgm.7 index 1b46a6b..57af65e 100644 --- a/man/man7/zmq_pgm.7 +++ b/man/man7/zmq_pgm.7 @@ -1,4 +1,4 @@ -.TH zmq_pgm 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_pgm 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME PGM-based tranport for 0MQ .SH SYNOPSIS diff --git a/man/man7/zmq_python.7 b/man/man7/zmq_python.7 index 14f3697..ee339f9 100644 --- a/man/man7/zmq_python.7 +++ b/man/man7/zmq_python.7 @@ -1,4 +1,4 @@ -.TH zmq_python 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_python 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME Python API for 0MQ lightweight messaging kernel .SH SYNOPSIS diff --git a/man/man7/zmq_ruby.7 b/man/man7/zmq_ruby.7 index 8c7bde3..e54a304 100644 --- a/man/man7/zmq_ruby.7 +++ b/man/man7/zmq_ruby.7 @@ -1,4 +1,4 @@ -.TH zmq_ruby 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_ruby 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME Ruby API for 0MQ lightweight messaging kernel .SH SYNOPSIS diff --git a/man/man7/zmq_tcp.7 b/man/man7/zmq_tcp.7 index 5bb867e..0b9a596 100644 --- a/man/man7/zmq_tcp.7 +++ b/man/man7/zmq_tcp.7 @@ -1,4 +1,4 @@ -.TH zmq_tcp 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_tcp 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME TCP-based tranport for 0MQ .SH SYNOPSIS diff --git a/man/man7/zmq_udp.7 b/man/man7/zmq_udp.7 index a6ce447..16cbf08 100644 --- a/man/man7/zmq_udp.7 +++ b/man/man7/zmq_udp.7 @@ -1,4 +1,4 @@ -.TH zmq_udp 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals" +.TH zmq_udp 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals" .SH NAME UDP-based tranport for 0MQ .SH SYNOPSIS diff --git a/packages/debian/copyright b/packages/debian/copyright index d6c3320..3839b2d 100644 --- a/packages/debian/copyright +++ b/packages/debian/copyright @@ -6,7 +6,7 @@ It was downloaded from http://www.zeromq.org/ Upstream Author(s): iMatix Corporation Copyright: - Copyright (C) 2007-2009 by iMatix Corporation + Copyright (C) 2007-2010 by iMatix Corporation License: diff --git a/perf/c/local_lat.c b/perf/c/local_lat.c index ca0ff9d..c53a684 100644 --- a/perf/c/local_lat.c +++ b/perf/c/local_lat.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/c/local_thr.c b/perf/c/local_thr.c index f785e80..94a011d 100644 --- a/perf/c/local_thr.c +++ b/perf/c/local_thr.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/c/remote_lat.c b/perf/c/remote_lat.c index 55c25b6..0c0a9f1 100644 --- a/perf/c/remote_lat.c +++ b/perf/c/remote_lat.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/c/remote_thr.c b/perf/c/remote_thr.c index e6cc661..ab4f060 100644 --- a/perf/c/remote_thr.c +++ b/perf/c/remote_thr.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/cpp/local_lat.cpp b/perf/cpp/local_lat.cpp index d8fee2e..6b7cb1a 100644 --- a/perf/cpp/local_lat.cpp +++ b/perf/cpp/local_lat.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/cpp/local_thr.cpp b/perf/cpp/local_thr.cpp index cbcc106..b5839be 100644 --- a/perf/cpp/local_thr.cpp +++ b/perf/cpp/local_thr.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/cpp/remote_lat.cpp b/perf/cpp/remote_lat.cpp index f6ccbb4..0d75c82 100644 --- a/perf/cpp/remote_lat.cpp +++ b/perf/cpp/remote_lat.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/cpp/remote_thr.cpp b/perf/cpp/remote_thr.cpp index 3eee16c..4985416 100644 --- a/perf/cpp/remote_thr.cpp +++ b/perf/cpp/remote_thr.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/java/local_lat.java b/perf/java/local_lat.java index 873f636..d886d4f 100644 --- a/perf/java/local_lat.java +++ b/perf/java/local_lat.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/java/local_thr.java b/perf/java/local_thr.java index 2881a08..171b169 100644 --- a/perf/java/local_thr.java +++ b/perf/java/local_thr.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/java/remote_lat.java b/perf/java/remote_lat.java index 905b82c..1db0520 100644 --- a/perf/java/remote_lat.java +++ b/perf/java/remote_lat.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/java/remote_thr.java b/perf/java/remote_thr.java index f696fc3..f1b5124 100644 --- a/perf/java/remote_thr.java +++ b/perf/java/remote_thr.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/perf/python/local_lat.py b/perf/python/local_lat.py index e9d46e0..bc1d804 100644 --- a/perf/python/local_lat.py +++ b/perf/python/local_lat.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/perf/python/local_thr.py b/perf/python/local_thr.py index 26896d0..395376c 100644 --- a/perf/python/local_thr.py +++ b/perf/python/local_thr.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/perf/python/remote_lat.py b/perf/python/remote_lat.py index 29bd550..52ab061 100644 --- a/perf/python/remote_lat.py +++ b/perf/python/remote_lat.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/perf/python/remote_thr.py b/perf/python/remote_thr.py index f7c69cf..5fb8a2b 100644 --- a/perf/python/remote_thr.py +++ b/perf/python/remote_thr.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/perf/ruby/local_lat.rb b/perf/ruby/local_lat.rb index 8806ccb..a299630 100644 --- a/perf/ruby/local_lat.rb +++ b/perf/ruby/local_lat.rb @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/perf/ruby/local_thr.rb b/perf/ruby/local_thr.rb index 6d9d13f..58447b4 100644 --- a/perf/ruby/local_thr.rb +++ b/perf/ruby/local_thr.rb @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/perf/ruby/remote_lat.rb b/perf/ruby/remote_lat.rb index f5b438d..7449aff 100644 --- a/perf/ruby/remote_lat.rb +++ b/perf/ruby/remote_lat.rb @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/perf/ruby/remote_thr.rb b/perf/ruby/remote_thr.rb index 760ff88..9edd1c6 100644 --- a/perf/ruby/remote_thr.rb +++ b/perf/ruby/remote_thr.rb @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/src/app_thread.cpp b/src/app_thread.cpp index 69e0942..c55eb75 100644 --- a/src/app_thread.cpp +++ b/src/app_thread.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/app_thread.hpp b/src/app_thread.hpp index 14cb8c5..0e2c3e1 100644 --- a/src/app_thread.hpp +++ b/src/app_thread.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/atomic_bitmap.hpp b/src/atomic_bitmap.hpp index 6b7218e..6620f06 100644 --- a/src/atomic_bitmap.hpp +++ b/src/atomic_bitmap.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp index 2cd225a..649fdbf 100644 --- a/src/atomic_counter.hpp +++ b/src/atomic_counter.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp index f96782f..3735e99 100644 --- a/src/atomic_ptr.hpp +++ b/src/atomic_ptr.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/command.hpp b/src/command.hpp index 8aa7c56..469d6ec 100644 --- a/src/command.hpp +++ b/src/command.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/config.hpp b/src/config.hpp index 43a4513..9724733 100644 --- a/src/config.hpp +++ b/src/config.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/decoder.hpp b/src/decoder.hpp index 5098dd5..1662bda 100644 --- a/src/decoder.hpp +++ b/src/decoder.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/devpoll.cpp b/src/devpoll.cpp index 0ee772b..003f465 100644 --- a/src/devpoll.cpp +++ b/src/devpoll.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/devpoll.hpp b/src/devpoll.hpp index b796ba5..019d268 100644 --- a/src/devpoll.hpp +++ b/src/devpoll.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 7115bca..9e713c2 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/dispatcher.hpp b/src/dispatcher.hpp index 8364d4d..799e65b 100644 --- a/src/dispatcher.hpp +++ b/src/dispatcher.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/downstream.cpp b/src/downstream.cpp index be1c4cc..2da08e3 100644 --- a/src/downstream.cpp +++ b/src/downstream.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/downstream.hpp b/src/downstream.hpp index bf8cabb..35dec95 100644 --- a/src/downstream.hpp +++ b/src/downstream.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/encoder.hpp b/src/encoder.hpp index cb43f9f..bd62298 100644 --- a/src/encoder.hpp +++ b/src/encoder.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/epoll.cpp b/src/epoll.cpp index b25883f..e22eb8c 100644 --- a/src/epoll.cpp +++ b/src/epoll.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/epoll.hpp b/src/epoll.hpp index 90824bd..38175cb 100644 --- a/src/epoll.hpp +++ b/src/epoll.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/err.cpp b/src/err.cpp index 36cb2fc..0ff6335 100644 --- a/src/err.cpp +++ b/src/err.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/err.hpp b/src/err.hpp index 88097b5..6c13b02 100644 --- a/src/err.hpp +++ b/src/err.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/fd_signaler.cpp b/src/fd_signaler.cpp index 5a8dcc1..a3a73c1 100644 --- a/src/fd_signaler.cpp +++ b/src/fd_signaler.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/fd_signaler.hpp b/src/fd_signaler.hpp index 513a1e4..f2037a9 100644 --- a/src/fd_signaler.hpp +++ b/src/fd_signaler.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_endpoint.hpp b/src/i_endpoint.hpp index 3bab2a5..3abd159 100644 --- a/src/i_endpoint.hpp +++ b/src/i_endpoint.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_engine.hpp b/src/i_engine.hpp index c21556f..d5d7811 100644 --- a/src/i_engine.hpp +++ b/src/i_engine.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_inout.hpp b/src/i_inout.hpp index 8a0ce6a..1053449 100644 --- a/src/i_inout.hpp +++ b/src/i_inout.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_poll_events.hpp b/src/i_poll_events.hpp index 8893b45..8b85f7a 100644 --- a/src/i_poll_events.hpp +++ b/src/i_poll_events.hpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2007-2009 FastMQ Inc. +Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_signaler.hpp b/src/i_signaler.hpp index ad04bb5..822ab8e 100644 --- a/src/i_signaler.hpp +++ b/src/i_signaler.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/io_object.cpp b/src/io_object.cpp index 0cf77fd..086f173 100644 --- a/src/io_object.cpp +++ b/src/io_object.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/io_object.hpp b/src/io_object.hpp index 7b66687..655e7f5 100644 --- a/src/io_object.hpp +++ b/src/io_object.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/io_thread.cpp b/src/io_thread.cpp index 1332795..2e1237b 100644 --- a/src/io_thread.cpp +++ b/src/io_thread.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/io_thread.hpp b/src/io_thread.hpp index c0dd77b..9377515 100644 --- a/src/io_thread.hpp +++ b/src/io_thread.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/kqueue.cpp b/src/kqueue.cpp index 8e33bdb..bf9c8a2 100644 --- a/src/kqueue.cpp +++ b/src/kqueue.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/kqueue.hpp b/src/kqueue.hpp index bed9108..d2dd09a 100644 --- a/src/kqueue.hpp +++ b/src/kqueue.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/likely.hpp b/src/likely.hpp index 3ca7bd6..b7a8171 100644 --- a/src/likely.hpp +++ b/src/likely.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/msg_content.hpp b/src/msg_content.hpp index cb217b7..3daf0e6 100644 --- a/src/msg_content.hpp +++ b/src/msg_content.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/mutex.hpp b/src/mutex.hpp index e233c9e..3306d2e 100644 --- a/src/mutex.hpp +++ b/src/mutex.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/object.cpp b/src/object.cpp index 66079db..20e712a 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/object.hpp b/src/object.hpp index b8d06b9..e6b2379 100644 --- a/src/object.hpp +++ b/src/object.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/options.cpp b/src/options.cpp index 3f903cb..cc02798 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/options.hpp b/src/options.hpp index 16bb857..b066d48 100644 --- a/src/options.hpp +++ b/src/options.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/owned.cpp b/src/owned.cpp index 1cb331c..d6be444 100644 --- a/src/owned.cpp +++ b/src/owned.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/owned.hpp b/src/owned.hpp index bfa8185..91189a1 100644 --- a/src/owned.hpp +++ b/src/owned.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/p2p.cpp b/src/p2p.cpp index 445ba5b..ae2424a 100644 --- a/src/p2p.cpp +++ b/src/p2p.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/p2p.hpp b/src/p2p.hpp index 32d7755..5bbe111 100644 --- a/src/p2p.hpp +++ b/src/p2p.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp index e9868f6..b611324 100644 --- a/src/pgm_receiver.cpp +++ b/src/pgm_receiver.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_receiver.hpp b/src/pgm_receiver.hpp index 6fadbc3..3d6a212 100644 --- a/src/pgm_receiver.hpp +++ b/src/pgm_receiver.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp index 0d87ee0..010d99f 100644 --- a/src/pgm_sender.cpp +++ b/src/pgm_sender.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_sender.hpp b/src/pgm_sender.hpp index e280843..8eb9d88 100644 --- a/src/pgm_sender.hpp +++ b/src/pgm_sender.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp index c79112b..0fbe58a 100644 --- a/src/pgm_socket.cpp +++ b/src/pgm_socket.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_socket.hpp b/src/pgm_socket.hpp index 3b2740c..502496a 100644 --- a/src/pgm_socket.hpp +++ b/src/pgm_socket.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pipe.cpp b/src/pipe.cpp index d994430..a8e7bb9 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pipe.hpp b/src/pipe.hpp index 9083ccd..a155e95 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/poll.cpp b/src/poll.cpp index 50a2426..889ea4a 100644 --- a/src/poll.cpp +++ b/src/poll.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/poll.hpp b/src/poll.hpp index 05732d0..5b8e745 100644 --- a/src/poll.hpp +++ b/src/poll.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/poller.hpp b/src/poller.hpp index 9051514..b769283 100644 --- a/src/poller.hpp +++ b/src/poller.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pub.cpp b/src/pub.cpp index 63b235e..05bfdcf 100644 --- a/src/pub.cpp +++ b/src/pub.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pub.hpp b/src/pub.hpp index 9dbcb4a..5b2f348 100644 --- a/src/pub.hpp +++ b/src/pub.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/rep.cpp b/src/rep.cpp index f06f4ab..b6bffae 100644 --- a/src/rep.cpp +++ b/src/rep.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/rep.hpp b/src/rep.hpp index 0b327aa..7170da7 100644 --- a/src/rep.hpp +++ b/src/rep.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/req.cpp b/src/req.cpp index 93a46e8..dc09387 100644 --- a/src/req.cpp +++ b/src/req.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/req.hpp b/src/req.hpp index 756cc42..60ee5e7 100644 --- a/src/req.hpp +++ b/src/req.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/select.cpp b/src/select.cpp index 3edd4ff..be5cd47 100644 --- a/src/select.cpp +++ b/src/select.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/select.hpp b/src/select.hpp index 01014d5..01e9fa8 100644 --- a/src/select.hpp +++ b/src/select.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/session.cpp b/src/session.cpp index a17e205..5b5fcb3 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/session.hpp b/src/session.hpp index c60cfc7..375d095 100644 --- a/src/session.hpp +++ b/src/session.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/simple_semaphore.hpp b/src/simple_semaphore.hpp index 3342281..78d72e5 100644 --- a/src/simple_semaphore.hpp +++ b/src/simple_semaphore.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 2348f67..3e6488d 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/socket_base.hpp b/src/socket_base.hpp index 16553ea..1ad9ed1 100644 --- a/src/socket_base.hpp +++ b/src/socket_base.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/stdint.hpp b/src/stdint.hpp index 1be8491..fe1bff6 100644 --- a/src/stdint.hpp +++ b/src/stdint.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/sub.cpp b/src/sub.cpp index b2174c5..bdc27da 100644 --- a/src/sub.cpp +++ b/src/sub.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/sub.hpp b/src/sub.hpp index a7cd134..df7d369 100644 --- a/src/sub.hpp +++ b/src/sub.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 9bca0f0..5dcebba 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_connecter.hpp b/src/tcp_connecter.hpp index bb358fd..d397296 100644 --- a/src/tcp_connecter.hpp +++ b/src/tcp_connecter.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp index 11707fb..9087405 100644 --- a/src/tcp_listener.cpp +++ b/src/tcp_listener.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_listener.hpp b/src/tcp_listener.hpp index 62498dc..1dfe288 100644 --- a/src/tcp_listener.hpp +++ b/src/tcp_listener.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_socket.cpp b/src/tcp_socket.cpp index 5c7d60d..cc426d7 100644 --- a/src/tcp_socket.cpp +++ b/src/tcp_socket.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_socket.hpp b/src/tcp_socket.hpp index e71a600..3aae060 100644 --- a/src/tcp_socket.hpp +++ b/src/tcp_socket.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/thread.cpp b/src/thread.cpp index d5b889d..602ca8b 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/thread.hpp b/src/thread.hpp index a1117b2..432770c 100644 --- a/src/thread.hpp +++ b/src/thread.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/upstream.cpp b/src/upstream.cpp index 32de63a..bdcd5ef 100644 --- a/src/upstream.cpp +++ b/src/upstream.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/upstream.hpp b/src/upstream.hpp index 3c82cdb..1e6914b 100644 --- a/src/upstream.hpp +++ b/src/upstream.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/uuid.cpp b/src/uuid.cpp index 6abc41d..6fdb060 100644 --- a/src/uuid.cpp +++ b/src/uuid.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/uuid.hpp b/src/uuid.hpp index e4716de..001ea94 100644 --- a/src/uuid.hpp +++ b/src/uuid.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/windows.hpp b/src/windows.hpp index d765c83..472b9c1 100644 --- a/src/windows.hpp +++ b/src/windows.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/wire.hpp b/src/wire.hpp index 4dbb063..9534cf6 100644 --- a/src/wire.hpp +++ b/src/wire.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/xrep.cpp b/src/xrep.cpp index 4fa250b..4cba21c 100644 --- a/src/xrep.cpp +++ b/src/xrep.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/xrep.hpp b/src/xrep.hpp index 66cb611..67ab02d 100644 --- a/src/xrep.hpp +++ b/src/xrep.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/xreq.cpp b/src/xreq.cpp index 9b95393..a4310f8 100644 --- a/src/xreq.cpp +++ b/src/xreq.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/xreq.hpp b/src/xreq.hpp index fdf8b0f..d0cbb4f 100644 --- a/src/xreq.hpp +++ b/src/xreq.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/yarray.hpp b/src/yarray.hpp index b2d3f1d..8c79b99 100644 --- a/src/yarray.hpp +++ b/src/yarray.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/yarray_item.hpp b/src/yarray_item.hpp index 1de62b8..b6d89cc 100644 --- a/src/yarray_item.hpp +++ b/src/yarray_item.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/ypipe.hpp b/src/ypipe.hpp index 0fb7951..26c50ab 100644 --- a/src/ypipe.hpp +++ b/src/ypipe.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/ypollset.cpp b/src/ypollset.cpp index 0f0d75f..51284a8 100644 --- a/src/ypollset.cpp +++ b/src/ypollset.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/ypollset.hpp b/src/ypollset.hpp index 810a638..c75b149 100644 --- a/src/ypollset.hpp +++ b/src/ypollset.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/yqueue.hpp b/src/yqueue.hpp index 1d3f8e8..45b2b18 100644 --- a/src/yqueue.hpp +++ b/src/yqueue.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq.cpp b/src/zmq.cpp index cce07af..e244171 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -264,7 +264,7 @@ int zmq_recv (void *s_, zmq_msg_t *msg_, int flags_) return (((zmq::socket_base_t*) s_)->recv (msg_, flags_)); } -int zmq_poll (zmq_pollitem_t *items_, int nitems_) +int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_) { #if defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_FREEBSD ||\ defined ZMQ_HAVE_OPENBSD || defined ZMQ_HAVE_SOLARIS ||\ @@ -321,6 +321,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_) npollfds++; } + int timeout = timeout_ > 0 ? timeout_ / 1000 : -1; int nevents = 0; bool initial = true; while (!nevents) { @@ -328,10 +329,16 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_) // Wait for activity. In the first iteration just check for events, // don't wait. Waiting would prevent exiting on any events that may // already be signaled on 0MQ sockets. - int rc = poll (pollfds, npollfds, initial ? 0 : -1); + int rc = poll (pollfds, npollfds, initial ? 0 : timeout); if (rc == -1 && errno == EINTR) continue; errno_assert (rc >= 0); + + // If timeout was hit with no events signaled, return zero. + if (!initial && rc == 0) + return 0; + + // From now on, perform blocking polling. initial = false; // Process 0MQ commands if needed. @@ -426,6 +433,8 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_) maxfd = notify_fd; } + timeval timeout = {timeout_ / 1000000, timeout_ % 1000000}; + timeval zero_timeout = {0, 0}; int nevents = 0; bool initial = true; while (!nevents) { @@ -433,17 +442,21 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_) // Wait for activity. In the first iteration just check for events, // don't wait. Waiting would prevent exiting on any events that may // already be signaled on 0MQ sockets. - timeval timeout = {0, 0}; int rc = select (maxfd, &pollset_in, &pollset_out, &pollset_err, - initial ? &timeout : NULL); + initial ? &zero_timeout : &timeout); #if defined ZMQ_HAVE_WINDOWS wsa_assert (rc != SOCKET_ERROR); #else if (rc == -1 && errno == EINTR) continue; #endif - errno_assert (rc >= 0); + + // If timeout was hit with no events signaled, return zero. + if (!initial && rc == 0) + return 0; + + // From now on, perform blocking select. initial = false; // Process 0MQ commands if needed. diff --git a/src/zmq_connecter.cpp b/src/zmq_connecter.cpp index 8f95fc0..d4c2727 100644 --- a/src/zmq_connecter.cpp +++ b/src/zmq_connecter.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_connecter.hpp b/src/zmq_connecter.hpp index e5b4a70..c3a42a9 100644 --- a/src/zmq_connecter.hpp +++ b/src/zmq_connecter.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_decoder.cpp b/src/zmq_decoder.cpp index b9617fc..cc4f846 100644 --- a/src/zmq_decoder.cpp +++ b/src/zmq_decoder.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_decoder.hpp b/src/zmq_decoder.hpp index 6df2558..5d9133b 100644 --- a/src/zmq_decoder.hpp +++ b/src/zmq_decoder.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_encoder.cpp b/src/zmq_encoder.cpp index 4824cd1..89649ef 100644 --- a/src/zmq_encoder.cpp +++ b/src/zmq_encoder.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_encoder.hpp b/src/zmq_encoder.hpp index 8d4e956..8eedef8 100644 --- a/src/zmq_encoder.hpp +++ b/src/zmq_encoder.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_engine.cpp b/src/zmq_engine.cpp index b568993..40cedfb 100644 --- a/src/zmq_engine.cpp +++ b/src/zmq_engine.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_engine.hpp b/src/zmq_engine.hpp index 63e1539..d26e304 100644 --- a/src/zmq_engine.hpp +++ b/src/zmq_engine.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_init.cpp b/src/zmq_init.cpp index 416e733..c602e1d 100644 --- a/src/zmq_init.cpp +++ b/src/zmq_init.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_init.hpp b/src/zmq_init.hpp index a17d621..414adfe 100644 --- a/src/zmq_init.hpp +++ b/src/zmq_init.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_listener.cpp b/src/zmq_listener.cpp index 6a7e2fd..9ccd82b 100644 --- a/src/zmq_listener.cpp +++ b/src/zmq_listener.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_listener.hpp b/src/zmq_listener.hpp index 899aaf9..6f8cdc9 100644 --- a/src/zmq_listener.hpp +++ b/src/zmq_listener.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. |