diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
| commit | 07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch) | |
| tree | 2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /src/PortEventPoll.cc | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'src/PortEventPoll.cc')
| -rw-r--r-- | src/PortEventPoll.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/PortEventPoll.cc b/src/PortEventPoll.cc index 577fe074..0610cd97 100644 --- a/src/PortEventPoll.cc +++ b/src/PortEventPoll.cc @@ -174,7 +174,7 @@ int translateEvents(EventPoll::EventType events) bool PortEventPoll::addEvents(sock_t socket, const PortEventPoll::KEvent& event) { - SharedHandle<KSocketEntry> socketEntry(new KSocketEntry(socket)); + std::shared_ptr<KSocketEntry> socketEntry(new KSocketEntry(socket)); KSocketEntrySet::iterator i = socketEntries_.lower_bound(socketEntry); int r = 0; int errNum = 0; @@ -215,7 +215,7 @@ bool PortEventPoll::addEvents(sock_t socket, Command* command, #ifdef ENABLE_ASYNC_DNS bool PortEventPoll::addEvents(sock_t socket, Command* command, int events, - const SharedHandle<AsyncNameResolver>& rs) + const std::shared_ptr<AsyncNameResolver>& rs) { return addEvents(socket, KADNSEvent(rs, command, socket, events)); } @@ -224,7 +224,7 @@ bool PortEventPoll::addEvents(sock_t socket, Command* command, int events, bool PortEventPoll::deleteEvents(sock_t socket, const PortEventPoll::KEvent& event) { - SharedHandle<KSocketEntry> socketEntry(new KSocketEntry(socket)); + std::shared_ptr<KSocketEntry> socketEntry(new KSocketEntry(socket)); KSocketEntrySet::iterator i = socketEntries_.find(socketEntry); if(i == socketEntries_.end()) { A2_LOG_DEBUG(fmt("Socket %d is not found in SocketEntries.", socket)); @@ -255,7 +255,7 @@ bool PortEventPoll::deleteEvents(sock_t socket, #ifdef ENABLE_ASYNC_DNS bool PortEventPoll::deleteEvents(sock_t socket, Command* command, - const SharedHandle<AsyncNameResolver>& rs) + const std::shared_ptr<AsyncNameResolver>& rs) { return deleteEvents(socket, KADNSEvent(rs, command, socket, 0)); } @@ -270,9 +270,9 @@ bool PortEventPoll::deleteEvents(sock_t socket, Command* command, #ifdef ENABLE_ASYNC_DNS bool PortEventPoll::addNameResolver -(const SharedHandle<AsyncNameResolver>& resolver, Command* command) +(const std::shared_ptr<AsyncNameResolver>& resolver, Command* command) { - SharedHandle<KAsyncNameResolverEntry> entry + std::shared_ptr<KAsyncNameResolverEntry> entry (new KAsyncNameResolverEntry(resolver, command)); KAsyncNameResolverEntrySet::iterator itr = nameResolverEntries_.find(entry); if(itr == nameResolverEntries_.end()) { @@ -285,9 +285,9 @@ bool PortEventPoll::addNameResolver } bool PortEventPoll::deleteNameResolver -(const SharedHandle<AsyncNameResolver>& resolver, Command* command) +(const std::shared_ptr<AsyncNameResolver>& resolver, Command* command) { - SharedHandle<KAsyncNameResolverEntry> entry + std::shared_ptr<KAsyncNameResolverEntry> entry (new KAsyncNameResolverEntry(resolver, command)); KAsyncNameResolverEntrySet::iterator itr = nameResolverEntries_.find(entry); if(itr == nameResolverEntries_.end()) { |