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

ChangeLog

@@ -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>
 
 	Use Event in EpollEventPoll

src/EpollEventPoll.cc

@@ -45,7 +45,7 @@
 namespace aria2 {
 
 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)
 {

src/EpollEventPoll.h

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

src/Event.h

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

src/PollEventPoll.cc

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

src/PollEventPoll.h

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