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/PollEventPoll.h | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'src/PollEventPoll.h')
| -rw-r--r-- | src/PollEventPoll.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/PollEventPoll.h b/src/PollEventPoll.h index af4de886..730a7da6 100644 --- a/src/PollEventPoll.h +++ b/src/PollEventPoll.h @@ -70,12 +70,12 @@ private: friend int accumulateEvent(int events, const KEvent& event); private: - typedef std::set<SharedHandle<KSocketEntry>, - DerefLess<SharedHandle<KSocketEntry> > > KSocketEntrySet; + typedef std::set<std::shared_ptr<KSocketEntry>, + DerefLess<std::shared_ptr<KSocketEntry> > > KSocketEntrySet; KSocketEntrySet socketEntries_; #ifdef ENABLE_ASYNC_DNS - typedef std::set<SharedHandle<KAsyncNameResolverEntry>, - DerefLess<SharedHandle<KAsyncNameResolverEntry> > > + typedef std::set<std::shared_ptr<KAsyncNameResolverEntry>, + DerefLess<std::shared_ptr<KAsyncNameResolverEntry> > > KAsyncNameResolverEntrySet; KAsyncNameResolverEntrySet nameResolverEntries_; #endif // ENABLE_ASYNC_DNS @@ -93,10 +93,10 @@ private: bool deleteEvents(sock_t socket, const KEvent& event); bool addEvents(sock_t socket, Command* command, int events, - const SharedHandle<AsyncNameResolver>& rs); + const std::shared_ptr<AsyncNameResolver>& rs); bool deleteEvents(sock_t socket, Command* command, - const SharedHandle<AsyncNameResolver>& rs); + const std::shared_ptr<AsyncNameResolver>& rs); static int translateEvents(EventPoll::EventType events); public: @@ -113,10 +113,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 static const int IEV_READ = POLLIN; |