diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2017-11-05 16:02:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-05 16:02:14 +0900 |
| commit | 8f5eaa4bbb751f396b4e653a8c3a7effa8a233df (patch) | |
| tree | b3113a601dc8d9b3b0ddda7d60c92dbef2bb6585 /src/PortEventPoll.cc | |
| parent | 16f458c9a4dcd2c7e8c476a2f71cbcaddd370a38 (diff) | |
| parent | 89be2fc649d6a50a62bcac79d2199e958be5ff26 (diff) | |
Merge pull request #1059 from kwkam/patch-3
replace some lines with make_shared
Diffstat (limited to 'src/PortEventPoll.cc')
| -rw-r--r-- | src/PortEventPoll.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/PortEventPoll.cc b/src/PortEventPoll.cc index e2b13832..ecd7fbfa 100644 --- a/src/PortEventPoll.cc +++ b/src/PortEventPoll.cc @@ -168,7 +168,7 @@ int translateEvents(EventPoll::EventType events) bool PortEventPoll::addEvents(sock_t socket, const PortEventPoll::KEvent& event) { - std::shared_ptr<KSocketEntry> socketEntry(new KSocketEntry(socket)); + auto socketEntry = std::make_shared<KSocketEntry>(socket); KSocketEntrySet::iterator i = socketEntries_.lower_bound(socketEntry); int r = 0; int errNum = 0; @@ -220,7 +220,7 @@ bool PortEventPoll::addEvents(sock_t socket, Command* command, int events, bool PortEventPoll::deleteEvents(sock_t socket, const PortEventPoll::KEvent& event) { - std::shared_ptr<KSocketEntry> socketEntry(new KSocketEntry(socket)); + auto socketEntry = std::make_shared<KSocketEntry>(socket); KSocketEntrySet::iterator i = socketEntries_.find(socketEntry); if (i == socketEntries_.end()) { A2_LOG_DEBUG(fmt("Socket %d is not found in SocketEntries.", socket)); @@ -271,8 +271,7 @@ bool PortEventPoll::deleteEvents(sock_t socket, Command* command, bool PortEventPoll::addNameResolver( const std::shared_ptr<AsyncNameResolver>& resolver, Command* command) { - std::shared_ptr<KAsyncNameResolverEntry> entry( - new KAsyncNameResolverEntry(resolver, command)); + auto entry = std::make_shared<KAsyncNameResolverEntry>(resolver, command); KAsyncNameResolverEntrySet::iterator itr = nameResolverEntries_.find(entry); if (itr == nameResolverEntries_.end()) { nameResolverEntries_.insert(entry); @@ -287,8 +286,7 @@ bool PortEventPoll::addNameResolver( bool PortEventPoll::deleteNameResolver( const std::shared_ptr<AsyncNameResolver>& resolver, Command* command) { - std::shared_ptr<KAsyncNameResolverEntry> entry( - new KAsyncNameResolverEntry(resolver, command)); + auto entry = std::make_shared<KAsyncNameResolverEntry>(resolver, command); KAsyncNameResolverEntrySet::iterator itr = nameResolverEntries_.find(entry); if (itr == nameResolverEntries_.end()) { return false; |