Merge branch 'master' of github.com:jthornber/thin-provisioning-tools

This commit is contained in:
Joe Thornber 2014-01-08 10:43:20 +00:00
commit 1b1df2fe65
5 changed files with 5 additions and 5 deletions

View File

@ -239,7 +239,7 @@ hint_array::hint_array(tm_ptr tm, unsigned width)
{
}
hint_array::hint_array(typename hint_array::tm_ptr tm, unsigned width,
hint_array::hint_array(hint_array::tm_ptr tm, unsigned width,
block_address root, unsigned nr_entries)
: width_(check_width(width)),
impl_(mk_array(tm, width, root, nr_entries))

View File

@ -56,7 +56,7 @@ namespace caching {
class hint_array {
public:
typedef boost::shared_ptr<hint_array> ptr;
typedef typename persistent_data::transaction_manager::ptr tm_ptr;
typedef persistent_data::transaction_manager::ptr tm_ptr;
hint_array(tm_ptr tm, unsigned width);
hint_array(tm_ptr tm, unsigned width, block_address root, unsigned nr_entries);

View File

@ -59,7 +59,7 @@ namespace {
virtual void mapping(pd::block_address cblock,
pd::block_address oblock,
bool dirty) {
typename caching::mapping m;
caching::mapping m;
m.oblock_ = oblock;
m.flags_ = M_VALID;

View File

@ -30,7 +30,7 @@ namespace persistent_data {
class bitset_impl {
public:
typedef boost::shared_ptr<bitset_impl> ptr;
typedef typename persistent_data::transaction_manager::ptr tm_ptr;
typedef persistent_data::transaction_manager::ptr tm_ptr;
bitset_impl(tm_ptr tm)
: nr_bits_(0),

View File

@ -49,7 +49,7 @@ namespace persistent_data {
class bitset {
public:
typedef boost::shared_ptr<bitset> ptr;
typedef typename persistent_data::transaction_manager::ptr tm_ptr;
typedef persistent_data::transaction_manager::ptr tm_ptr;
bitset(tm_ptr tm);
bitset(tm_ptr tm, block_address root, unsigned nr_bits);