diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-07-04 21:44:09 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-07-04 21:44:09 +0900 |
| commit | 0cdeaa817783bfd74fddbc84079812b0ce77dfe1 (patch) | |
| tree | 088433ba37d5d8819146706eb64ff5a8b71fe840 /src/FileEntry.cc | |
| parent | 107de5899779d4c2eecc86aaf74dc4cec8286293 (diff) | |
Return nullptr directly where std::shared_ptr is expected
The constructor of std::shared_ptr which takes nullptr is not explicit
so we can return nullptr directly.
Diffstat (limited to 'src/FileEntry.cc')
| -rw-r--r-- | src/FileEntry.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/FileEntry.cc b/src/FileEntry.cc index 79679052..478a90ac 100644 --- a/src/FileEntry.cc +++ b/src/FileEntry.cc @@ -221,12 +221,12 @@ FileEntry::findFasterRequest(const std::shared_ptr<Request>& base) const int startupIdleTime = 10; if(requestPool_.empty() || lastFasterReplace_.difference(global::wallclock()) < startupIdleTime) { - return std::shared_ptr<Request>(); + return nullptr; } const std::shared_ptr<PeerStat>& fastest = (*requestPool_.begin())->getPeerStat(); if(!fastest) { - return std::shared_ptr<Request>(); + return nullptr; } const std::shared_ptr<PeerStat>& basestat = base->getPeerStat(); // TODO hard coded value. See PREF_STARTUP_IDLE_TIME @@ -241,7 +241,7 @@ FileEntry::findFasterRequest(const std::shared_ptr<Request>& base) lastFasterReplace_ = global::wallclock(); return fastestRequest; } - return std::shared_ptr<Request>(); + return nullptr; } std::shared_ptr<Request> @@ -253,7 +253,7 @@ FileEntry::findFasterRequest const int startupIdleTime = 10; const int SPEED_THRESHOLD = 20*1024; if(lastFasterReplace_.difference(global::wallclock()) < startupIdleTime) { - return std::shared_ptr<Request>(); + return nullptr; } std::vector<std::string> inFlightHosts; enumerateInFlightHosts(inFlightRequests_.begin(), inFlightRequests_.end(), @@ -307,7 +307,7 @@ FileEntry::findFasterRequest return fastestRequest; } A2_LOG_DEBUG("No faster server found."); - return std::shared_ptr<Request>(); + return nullptr; } void FileEntry::storePool(const std::shared_ptr<Request>& request) |