summaryrefslogtreecommitdiff
path: root/src/SelectEventPoll.h
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2013-06-22 01:10:38 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2013-06-22 01:10:38 +0900
commit07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch)
tree2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /src/SelectEventPoll.h
parent126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff)
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'src/SelectEventPoll.h')
-rw-r--r--src/SelectEventPoll.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/SelectEventPoll.h b/src/SelectEventPoll.h
index f4eeabe6..56623c00 100644
--- a/src/SelectEventPoll.h
+++ b/src/SelectEventPoll.h
@@ -133,12 +133,12 @@ private:
class AsyncNameResolverEntry {
private:
- SharedHandle<AsyncNameResolver> nameResolver_;
+ std::shared_ptr<AsyncNameResolver> nameResolver_;
Command* command_;
public:
- AsyncNameResolverEntry(const SharedHandle<AsyncNameResolver>& nameResolver,
+ AsyncNameResolverEntry(const std::shared_ptr<AsyncNameResolver>& nameResolver,
Command* command);
bool operator==(const AsyncNameResolverEntry& entry)
@@ -164,12 +164,12 @@ private:
fd_set wfdset_;
sock_t fdmax_;
- typedef std::set<SharedHandle<SocketEntry>,
- DerefLess<SharedHandle<SocketEntry> > > SocketEntrySet;
+ typedef std::set<std::shared_ptr<SocketEntry>,
+ DerefLess<std::shared_ptr<SocketEntry> > > SocketEntrySet;
SocketEntrySet socketEntries_;
#ifdef ENABLE_ASYNC_DNS
- typedef std::set<SharedHandle<AsyncNameResolverEntry>,
- DerefLess<SharedHandle<AsyncNameResolverEntry> > >
+ typedef std::set<std::shared_ptr<AsyncNameResolverEntry>,
+ DerefLess<std::shared_ptr<AsyncNameResolverEntry> > >
AsyncNameResolverEntrySet;
AsyncNameResolverEntrySet nameResolverEntries_;
#endif // ENABLE_ASYNC_DNS
@@ -195,10 +195,10 @@ public:
Command* command, EventPoll::EventType events);
#ifdef ENABLE_ASYNC_DNS
- virtual bool addNameResolver(const SharedHandle<AsyncNameResolver>& resolver,
+ virtual bool addNameResolver(const std::shared_ptr<AsyncNameResolver>& resolver,
Command* command);
virtual bool deleteNameResolver
- (const SharedHandle<AsyncNameResolver>& resolver, Command* command);
+ (const std::shared_ptr<AsyncNameResolver>& resolver, Command* command);
#endif // ENABLE_ASYNC_DNS
};