From 93e5dbed325f29c1bf867a2847d3b839d545cfb2 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 12 Nov 2010 12:48:48 +0000 Subject: 2010-11-12 Tatsuhiro Tsujikawa Removed SharedHandle::isNull(). Instead we added operator* and operator unspecified_bool_type. Removed use of WeakHandle and replaced with raw pointer. --- src/MultiFileAllocationIterator.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/MultiFileAllocationIterator.cc') diff --git a/src/MultiFileAllocationIterator.cc b/src/MultiFileAllocationIterator.cc index 9a0dc3f5..85b3f527 100644 --- a/src/MultiFileAllocationIterator.cc +++ b/src/MultiFileAllocationIterator.cc @@ -55,7 +55,7 @@ MultiFileAllocationIterator::~MultiFileAllocationIterator() {} void MultiFileAllocationIterator::allocateChunk() { - while(fileAllocationIterator_.isNull() || + while(!fileAllocationIterator_ || fileAllocationIterator_->finished()) { if(entries_.empty()) { break; @@ -92,12 +92,12 @@ void MultiFileAllocationIterator::allocateChunk() bool MultiFileAllocationIterator::finished() { return entries_.empty() && - (fileAllocationIterator_.isNull() || fileAllocationIterator_->finished()); + (!fileAllocationIterator_ || fileAllocationIterator_->finished()); } off_t MultiFileAllocationIterator::getCurrentLength() { - if(fileAllocationIterator_.isNull()) { + if(!fileAllocationIterator_) { return 0; } else { return fileAllocationIterator_->getCurrentLength(); @@ -106,7 +106,7 @@ off_t MultiFileAllocationIterator::getCurrentLength() uint64_t MultiFileAllocationIterator::getTotalLength() { - if(fileAllocationIterator_.isNull()) { + if(!fileAllocationIterator_) { return 0; } else { return fileAllocationIterator_->getTotalLength(); -- cgit