mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-10-04 21:29:21 +00:00
Moved Poll to net namespace.
This commit is contained in:
@@ -7,13 +7,13 @@
|
|||||||
namespace input {
|
namespace input {
|
||||||
|
|
||||||
void
|
void
|
||||||
InputEvent::insert(torrent::Poll* p) {
|
InputEvent::insert(torrent::net::Poll* p) {
|
||||||
p->open(this);
|
p->open(this);
|
||||||
p->insert_read(this);
|
p->insert_read(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
InputEvent::remove(torrent::Poll* p) {
|
InputEvent::remove(torrent::net::Poll* p) {
|
||||||
p->remove_read(this);
|
p->remove_read(this);
|
||||||
p->close(this);
|
p->close(this);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
#include <torrent/event.h>
|
#include <torrent/event.h>
|
||||||
#include <torrent/poll.h>
|
#include <torrent/net/poll.h>
|
||||||
|
|
||||||
namespace input {
|
namespace input {
|
||||||
|
|
||||||
@@ -14,8 +14,8 @@ public:
|
|||||||
|
|
||||||
InputEvent(int fd) { m_fileDesc = fd; }
|
InputEvent(int fd) { m_fileDesc = fd; }
|
||||||
|
|
||||||
void insert(torrent::Poll* p);
|
void insert(torrent::net::Poll* p);
|
||||||
void remove(torrent::Poll* p);
|
void remove(torrent::net::Poll* p);
|
||||||
|
|
||||||
void event_read();
|
void event_read();
|
||||||
void event_write();
|
void event_write();
|
||||||
|
|||||||
+1
-1
@@ -3,10 +3,10 @@
|
|||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <torrent/connection_manager.h>
|
#include <torrent/connection_manager.h>
|
||||||
#include <torrent/poll.h>
|
|
||||||
#include <torrent/torrent.h>
|
#include <torrent/torrent.h>
|
||||||
#include <torrent/exceptions.h>
|
#include <torrent/exceptions.h>
|
||||||
#include <torrent/net/fd.h>
|
#include <torrent/net/fd.h>
|
||||||
|
#include <torrent/net/poll.h>
|
||||||
#include <torrent/net/socket_address.h>
|
#include <torrent/net/socket_address.h>
|
||||||
|
|
||||||
#include "control.h"
|
#include "control.h"
|
||||||
|
|||||||
@@ -8,8 +8,8 @@
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <torrent/exceptions.h>
|
#include <torrent/exceptions.h>
|
||||||
#include <torrent/poll.h>
|
|
||||||
#include <torrent/torrent.h>
|
#include <torrent/torrent.h>
|
||||||
|
#include <torrent/net/poll.h>
|
||||||
#include <torrent/utils/log.h>
|
#include <torrent/utils/log.h>
|
||||||
#include <torrent/utils/thread.h>
|
#include <torrent/utils/thread.h>
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#include "test/helpers/mock_function.h"
|
#include "test/helpers/mock_function.h"
|
||||||
#include "torrent/exceptions.h"
|
#include "torrent/exceptions.h"
|
||||||
#include "torrent/poll.h"
|
#include "torrent/net/poll.h"
|
||||||
|
|
||||||
const int test_thread::test_flag_pre_stop;
|
const int test_thread::test_flag_pre_stop;
|
||||||
const int test_thread::test_flag_long_timeout;
|
const int test_thread::test_flag_long_timeout;
|
||||||
|
|||||||
Reference in New Issue
Block a user