diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2012-02-16 10:09:58 +0900 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2012-02-16 10:09:58 +0900 |
commit | 24cf53ad6eaa0eb9a873b909e932d95417f52d2c (patch) | |
tree | 0d2f19a76536d09d0fe6e22874ce572eda70eccd /src/io_object.cpp | |
parent | 0641ffa5e9588dd7daaf389c40a213994fe4b1b1 (diff) |
io_thread_t merged with poller_base_t
The relationship of these two classes was 1:1.
Thus one of them was obsolete.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/io_object.cpp')
-rw-r--r-- | src/io_object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/io_object.cpp b/src/io_object.cpp index abc8204..0c73571 100644 --- a/src/io_object.cpp +++ b/src/io_object.cpp @@ -20,10 +20,10 @@ */ #include "io_object.hpp" -#include "io_thread.hpp" +#include "poller_base.hpp" #include "err.hpp" -xs::io_object_t::io_object_t (io_thread_t *io_thread_) : +xs::io_object_t::io_object_t (poller_base_t *io_thread_) : poller (NULL) { if (io_thread_) @@ -34,13 +34,13 @@ xs::io_object_t::~io_object_t () { } -void xs::io_object_t::plug (io_thread_t *io_thread_) +void xs::io_object_t::plug (poller_base_t *io_thread_) { xs_assert (io_thread_); xs_assert (!poller); // Retrieve the poller from the thread we are running in. - poller = io_thread_->get_poller (); + poller = io_thread_; } void xs::io_object_t::unplug () |