emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caching/hint_array.cc
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) block_address root, unsigned nr_entries)
: width_(check_width(width)), : width_(check_width(width)),
impl_(mk_array(tm, width, root, nr_entries)) impl_(mk_array(tm, width, root, nr_entries))

2
caching/hint_array.h
View File

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

2
caching/restore_emitter.cc
View File

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

2
persistent-data/data-structures/bitset.cc
View File

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

2
persistent-data/data-structures/bitset.h
View File

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