From 3a4c06b772bc8ca27bcf7c2d82abc46c65c23795 Mon Sep 17 00:00:00 2001 From: Denys Duchier Date: Sat, 16 Nov 2013 21:42:23 +0100 Subject: [PATCH] use persistent-data::bitset to avoid ambiguity --- caching/cache_check.cc | 2 +- caching/metadata.cc | 6 +++--- caching/metadata.h | 2 +- persistent-data/data-structures/bitset.cc | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/caching/cache_check.cc b/caching/cache_check.cc index cbe4581..419169f 100644 --- a/caching/cache_check.cc +++ b/caching/cache_check.cc @@ -254,7 +254,7 @@ namespace { out << "examining discard bitset" << end_message(); { nested_output::nest _ = out.push(); - bitset discards(tm, sb.discard_root, sb.discard_nr_blocks); + persistent_data::bitset discards(tm, sb.discard_root, sb.discard_nr_blocks); } } } diff --git a/caching/metadata.cc b/caching/metadata.cc index 2d8ef83..7281c14 100644 --- a/caching/metadata.cc +++ b/caching/metadata.cc @@ -79,7 +79,7 @@ metadata::create_metadata(block_manager<>::ptr bm) // We can't instantiate the hint array yet, since we don't know the // hint width. - discard_bits_ = bitset::ptr(new bitset(tm_)); + discard_bits_ = persistent_data::bitset::ptr(new persistent_data::bitset(tm_)); } void @@ -100,8 +100,8 @@ metadata::open_metadata(block_manager<>::ptr bm) sb_.hint_root, sb_.cache_blocks)); if (sb_.discard_root) - discard_bits_ = bitset::ptr( - new bitset(tm_, sb_.discard_root, sb_.discard_nr_blocks)); + discard_bits_ = persistent_data::bitset::ptr( + new persistent_data::bitset(tm_, sb_.discard_root, sb_.discard_nr_blocks)); } void diff --git a/caching/metadata.h b/caching/metadata.h index 611b424..546a994 100644 --- a/caching/metadata.h +++ b/caching/metadata.h @@ -38,7 +38,7 @@ namespace caching { checked_space_map::ptr metadata_sm_; mapping_array::ptr mappings_; hint_array::ptr hints_; - bitset::ptr discard_bits_; + persistent_data::bitset::ptr discard_bits_; private: void init_superblock(); diff --git a/persistent-data/data-structures/bitset.cc b/persistent-data/data-structures/bitset.cc index 9625dae..fa334ef 100644 --- a/persistent-data/data-structures/bitset.cc +++ b/persistent-data/data-structures/bitset.cc @@ -198,54 +198,54 @@ namespace persistent_data { //---------------------------------------------------------------- -bitset::bitset(tm_ptr tm) +persistent_data::bitset::bitset(tm_ptr tm) : impl_(new bitset_impl(tm)) { } -bitset::bitset(tm_ptr tm, block_address root, unsigned nr_bits) +persistent_data::bitset::bitset(tm_ptr tm, block_address root, unsigned nr_bits) : impl_(new bitset_impl(tm, root, nr_bits)) { } block_address -bitset::get_root() const +persistent_data::bitset::get_root() const { return impl_->get_root(); } void -bitset::grow(unsigned new_nr_bits, bool default_value) +persistent_data::bitset::grow(unsigned new_nr_bits, bool default_value) { impl_->grow(new_nr_bits, default_value); } void -bitset::destroy() +persistent_data::bitset::destroy() { impl_->destroy(); } bool -bitset::get(unsigned n) +persistent_data::bitset::get(unsigned n) { return impl_->get(n); } void -bitset::set(unsigned n, bool value) +persistent_data::bitset::set(unsigned n, bool value) { impl_->set(n, value); } void -bitset::flush() +persistent_data::bitset::flush() { impl_->flush(); } void -bitset::walk_bitset(bitset_visitor &v) const +persistent_data::bitset::walk_bitset(bitset_visitor &v) const { impl_->walk_bitset(v); }