github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2010-04-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Removed EventRType template parameter
	* src/EpollEventPoll.cc
	* src/EpollEventPoll.h
	* src/Event.h
	* src/PollEventPoll.cc
	* src/PollEventPoll.h
pull/1/head
Tatsuhiro Tsujikawa 2010-04-20 13:19:36 +00:00
parent 3b8c54108c
commit 1d652cd0ad
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2010-04-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed EventRType template parameter
* src/EpollEventPoll.cc
* src/EpollEventPoll.h
* src/Event.h
* src/PollEventPoll.cc
* src/PollEventPoll.h
2010-04-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-04-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Use Event in EpollEventPoll Use Event in EpollEventPoll

2
src/EpollEventPoll.cc
View File

@ -45,7 +45,7 @@
namespace aria2 { namespace aria2 {
EpollEventPoll::KSocketEntry::KSocketEntry(sock_t s): EpollEventPoll::KSocketEntry::KSocketEntry(sock_t s):
SocketEntry<KCommandEvent, KADNSEvent, struct epoll_event>(s) {} SocketEntry<KCommandEvent, KADNSEvent>(s) {}
int accumulateEvent(int events, const EpollEventPoll::KEvent& event) int accumulateEvent(int events, const EpollEventPoll::KEvent& event)
{ {

4
src/EpollEventPoll.h
View File

@ -61,11 +61,11 @@ private:
friend class AsyncNameResolverEntry<EpollEventPoll>; friend class AsyncNameResolverEntry<EpollEventPoll>;
class KSocketEntry: class KSocketEntry:
public SocketEntry<KCommandEvent, KADNSEvent, struct epoll_event> { public SocketEntry<KCommandEvent, KADNSEvent> {
public: public:
KSocketEntry(sock_t socket); KSocketEntry(sock_t socket);
virtual struct epoll_event getEvents(); struct epoll_event getEvents();
}; };
friend int accumulateEvent(int events, const KEvent& event); friend int accumulateEvent(int events, const KEvent& event);

4
src/Event.h
View File

@ -194,7 +194,7 @@ template<typename SocketEntry, typename EventPoll>
class ADNSEvent : public Event<SocketEntry> {}; class ADNSEvent : public Event<SocketEntry> {};
#endif // !ENABLE_ASYNC_DNS #endif // !ENABLE_ASYNC_DNS
template<typename CommandEvent, typename ADNSEvent, typename EventRType> template<typename CommandEvent, typename ADNSEvent>
class SocketEntry { class SocketEntry {
protected: protected:
sock_t _socket; sock_t _socket;
@ -269,8 +269,6 @@ public:
} }
#endif // ENABLE_ASYNC_DNS #endif // ENABLE_ASYNC_DNS
virtual EventRType getEvents() = 0;
sock_t getSocket() const sock_t getSocket() const
{ {
return _socket; return _socket;

2
src/PollEventPoll.cc
View File

@ -45,7 +45,7 @@
namespace aria2 { namespace aria2 {
PollEventPoll::KSocketEntry::KSocketEntry(sock_t s): PollEventPoll::KSocketEntry::KSocketEntry(sock_t s):
SocketEntry<KCommandEvent, KADNSEvent, struct pollfd>(s) {} SocketEntry<KCommandEvent, KADNSEvent>(s) {}
int accumulateEvent(int events, const PollEventPoll::KEvent& event) int accumulateEvent(int events, const PollEventPoll::KEvent& event)
{ {

4
src/PollEventPoll.h
View File

@ -61,11 +61,11 @@ private:
friend class AsyncNameResolverEntry<PollEventPoll>; friend class AsyncNameResolverEntry<PollEventPoll>;
class KSocketEntry: class KSocketEntry:
public SocketEntry<KCommandEvent, KADNSEvent, struct pollfd> { public SocketEntry<KCommandEvent, KADNSEvent> {
public: public:
KSocketEntry(sock_t socket); KSocketEntry(sock_t socket);
virtual struct pollfd getEvents(); struct pollfd getEvents();
}; };
friend int accumulateEvent(int events, const KEvent& event); friend int accumulateEvent(int events, const KEvent& event);