diff options
| author | malosek <malosek@fastmq.com> | 2009-10-05 10:22:31 +0200 |
|---|---|---|
| committer | malosek <malosek@fastmq.com> | 2009-10-05 10:22:31 +0200 |
| commit | d57ee0984ac3f8712063a7f83d7200be25ca5513 (patch) | |
| tree | a956443e70c48ebd21242c11cc015db61c53c682 /src/io_object.cpp | |
| parent | ff65e26ce7567ea6a907e566f8530f4988231d68 (diff) | |
| parent | 4efe2366d7394e8969fc9aa64c50be6842d8455f (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src/io_object.cpp')
| -rw-r--r-- | src/io_object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/io_object.cpp b/src/io_object.cpp index f61e5f0..0cf77fd 100644 --- a/src/io_object.cpp +++ b/src/io_object.cpp @@ -36,7 +36,7 @@ void zmq::io_object_t::set_io_thread (io_thread_t *io_thread_) poller = io_thread_->get_poller (); } -zmq::handle_t zmq::io_object_t::add_fd (fd_t fd_) +zmq::io_object_t::handle_t zmq::io_object_t::add_fd (fd_t fd_) { return poller->add_fd (fd_, this); } |