From 1cc6737c267e5956b391c781021d8a460af05032 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Thu, 10 Jan 2013 11:02:06 +0000 Subject: [PATCH] Remove the typedef block_ptr and change code to use block::ptr instead --- persistent-data/block.h | 7 +++---- persistent-data/block.tcc | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/persistent-data/block.h b/persistent-data/block.h index dae8e23..3236d17 100644 --- a/persistent-data/block.h +++ b/persistent-data/block.h @@ -157,12 +157,11 @@ namespace persistent_data { block_type bt_; bool dirty_; }; - typedef typename block::ptr block_ptr; // FIXME: remove class read_ref { public: read_ref(block_manager const &bm, - block_ptr b); + typename block::ptr b); read_ref(read_ref const &rhs); virtual ~read_ref(); @@ -173,7 +172,7 @@ namespace persistent_data { protected: block_manager const *bm_; - block_ptr block_; + typename block::ptr block_; unsigned *holders_; }; @@ -227,7 +226,7 @@ namespace persistent_data { private: void check(block_address b) const; - void write_block(block_ptr b) const; + void write_block(typename block::ptr b) const; enum lock_type { READ_LOCK, diff --git a/persistent-data/block.tcc b/persistent-data/block.tcc index e7fcc16..8f2594d 100644 --- a/persistent-data/block.tcc +++ b/persistent-data/block.tcc @@ -153,7 +153,7 @@ block_manager::block::flush() template block_manager::read_ref::read_ref(block_manager const &bm, - block_ptr b) + typename block::ptr b) : bm_(&bm), block_(b), holders_(new unsigned) @@ -218,7 +218,7 @@ block_manager::read_ref::data() const template block_manager::write_ref::write_ref(block_manager const &bm, - block_ptr b) + typename block::ptr b) : read_ref(bm, b) { b->dirty_ = true; @@ -252,14 +252,14 @@ block_manager::read_lock(block_address location, tracker_.read_lock(location); try { check(location); - boost::optional cached_block = cache_.get(location); + boost::optional cached_block = cache_.get(location); if (cached_block) { (*cached_block)->check_read_lockable(); return read_ref(*this, *cached_block); } - block_ptr b(new block(io_, location, BT_NORMAL, v)); + typename block::ptr b(new block(io_, location, BT_NORMAL, v)); cache_.insert(b); return read_ref(*this, b); @@ -278,14 +278,14 @@ block_manager::write_lock(block_address location, try { check(location); - boost::optional cached_block = cache_.get(location); + boost::optional cached_block = cache_.get(location); if (cached_block) { (*cached_block)->check_write_lockable(); return write_ref(*this, *cached_block); } - block_ptr b(new block(io_, location, BT_NORMAL, v)); + typename block::ptr b(new block(io_, location, BT_NORMAL, v)); cache_.insert(b); return write_ref(*this, b); @@ -305,14 +305,14 @@ block_manager::write_lock_zero(block_address location, try { check(location); - boost::optional cached_block = cache_.get(location); + boost::optional cached_block = cache_.get(location); if (cached_block) { (*cached_block)->check_write_lockable(); memset((*cached_block)->data_->raw(), 0, BlockSize); return write_ref(*this, *cached_block); } - block_ptr b(new block(io_, location, BT_NORMAL, v, true)); + typename block::ptr b(new block(io_, location, BT_NORMAL, v, true)); cache_.insert(b); return write_ref(*this, b); @@ -331,7 +331,7 @@ block_manager::superblock(block_address location, try { check(location); - boost::optional cached_block = cache_.get(location); + boost::optional cached_block = cache_.get(location); if (cached_block) { (*cached_block)->check_write_lockable(); @@ -340,7 +340,7 @@ block_manager::superblock(block_address location, return write_ref(*this, *cached_block); } - block_ptr b(new block(io_, location, BT_SUPERBLOCK, v)); + typename block::ptr b(new block(io_, location, BT_SUPERBLOCK, v)); cache_.insert(b); return write_ref(*this, b); @@ -359,7 +359,7 @@ block_manager::superblock_zero(block_address location, try { check(location); - boost::optional cached_block = cache_.get(location); + boost::optional cached_block = cache_.get(location); if (cached_block) { (*cached_block)->check_write_lockable(); @@ -368,7 +368,7 @@ block_manager::superblock_zero(block_address location, return write_ref(*this, *cached_block); } - block_ptr b(new block(io_, location, BT_SUPERBLOCK, + typename block::ptr b(new block(io_, location, BT_SUPERBLOCK, mk_validator(new noop_validator), true)); b->validator_ = v; cache_.insert(b); @@ -397,7 +397,7 @@ block_manager::get_nr_blocks() const template void -block_manager::write_block(block_ptr b) const +block_manager::write_block(typename block::ptr b) const { b->flush(); }