← Back to branch summary

~ubuntu-branches/ubuntu/trusty/aria2/trusty-proposed

« back to all changes in this revision

Viewing changes to src/FileEntry.cc

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry
  • Date: 2013-12-16 18:41:03 UTC
  • mfrom: (2.5.21 sid)
  • Revision ID: package-import@ubuntu.com-20131216184103-xzah3019zwut429g
Tags: 1.18.1-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/FileEntry.cc
197
197
    // sleeping(Request::getWakeTime() < global::wallclock()).  If all
198
198
    // pooled objects are sleeping, return first one.  Caller should
199
199
    // inspect returned object's getWakeTime().
200
 
    RequestPool::iterator i = requestPool_.begin();
201
 
    RequestPool::iterator eoi = requestPool_.end();
 
200
    auto i = requestPool_.begin();
 
201
    auto eoi = requestPool_.end();
202
202
    for(; i != eoi; ++i) {
203
203
      if((*i)->getWakeTime() <= global::wallclock()) {
204
204
        break;
494
494
  }
495
495
  spentUris_.erase(itr);
496
496
  std::shared_ptr<Request> req;
497
 
  InFlightRequestSet::iterator riter =
 
497
  auto riter =
498
498
    findRequestByUri(inFlightRequests_.begin(), inFlightRequests_.end(), uri);
499
499
  if(riter == inFlightRequests_.end()) {
500
 
    RequestPool::iterator riter = findRequestByUri(requestPool_.begin(),
 
500
    auto riter = findRequestByUri(requestPool_.begin(),
501
501
                                                    requestPool_.end(), uri);
502
502
    if(riter == requestPool_.end()) {
503
503
      return true;