From 596e5c616218c9681adf4eb45077608510e2876e Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 13 Sep 2014 15:36:27 +0900
Subject: Refactor event poll classes so that we don't have to allocate memory
 on query

I left Port and libuv classes, since I don't have them compiled.
So they were updated minimally.
---
 src/PortEventPoll.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/PortEventPoll.cc')

diff --git a/src/PortEventPoll.cc b/src/PortEventPoll.cc
index 0610cd97..9607729e 100644
--- a/src/PortEventPoll.cc
+++ b/src/PortEventPoll.cc
@@ -179,7 +179,7 @@ bool PortEventPoll::addEvents(sock_t socket,
   int r = 0;
   int errNum = 0;
   if(i != socketEntries_.end() && *(*i) == *socketEntry) {
-    event.addSelf(*i);
+    event.addSelf((*i).get());
     A2PortEvent pv = (*i)->getEvents();
     r = port_associate(port_, PORT_SOURCE_FD, (*i)->getSocket(),
                        pv.events, pv.socketEntry);
@@ -191,7 +191,7 @@ bool PortEventPoll::addEvents(sock_t socket,
       delete [] portEvents_;
       portEvents_ = new port_event_t[portEventsSize_];
     }
-    event.addSelf(socketEntry);
+    event.addSelf(socketEntry.get());
     A2PortEvent pv = socketEntry->getEvents();
     r = port_associate(port_, PORT_SOURCE_FD, socketEntry->getSocket(),
                        pv.events, pv.socketEntry);
@@ -230,7 +230,7 @@ bool PortEventPoll::deleteEvents(sock_t socket,
     A2_LOG_DEBUG(fmt("Socket %d is not found in SocketEntries.", socket));
     return false;
   } else {
-    event.removeSelf(*i);
+    event.removeSelf((*i).get());
     int r = 0;
     int errNum = 0;
     if((*i)->eventEmpty()) {
-- 
cgit