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

Take out some 'typename's to support older versions of gcc (Heinz).

Browse Source
This commit is contained in:
Joe Thornber 2013-08-15 10:35:07 +01:00
parent c6ec0c9c9c
commit 77286e0bc7
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistent-data/block.tcc
View File

@ -61,7 +61,7 @@ namespace {
} }
bool file_exists(string const &path) { bool file_exists(string const &path) {
typename ::stat info; struct ::stat info;
int r = ::stat(path.c_str(), &info); int r = ::stat(path.c_str(), &info);
if (r) { if (r) {

8
persistent-data/data-structures/btree.h
View File

@ -213,7 +213,7 @@ namespace persistent_data {
class ro_spine : private boost::noncopyable { class ro_spine : private boost::noncopyable {
public: public:
ro_spine(transaction_manager::ptr tm, ro_spine(transaction_manager::ptr tm,
typename block_manager<>::validator::ptr v) block_manager<>::validator::ptr v)
: tm_(tm), : tm_(tm),
validator_(v) { validator_(v) {
} }
@ -227,7 +227,7 @@ namespace persistent_data {
private: private:
transaction_manager::ptr tm_; transaction_manager::ptr tm_;
typename block_manager<>::validator::ptr validator_; block_manager<>::validator::ptr validator_;
std::list<block_manager<>::read_ref> spine_; std::list<block_manager<>::read_ref> spine_;
}; };
@ -237,7 +237,7 @@ namespace persistent_data {
typedef transaction_manager::write_ref write_ref; typedef transaction_manager::write_ref write_ref;
shadow_spine(transaction_manager::ptr tm, shadow_spine(transaction_manager::ptr tm,
typename block_manager<>::validator::ptr v) block_manager<>::validator::ptr v)
: tm_(tm), : tm_(tm),
validator_(v) { validator_(v) {
@ -287,7 +287,7 @@ namespace persistent_data {
private: private:
transaction_manager::ptr tm_; transaction_manager::ptr tm_;
typename block_manager<>::validator::ptr validator_; block_manager<>::validator::ptr validator_;
std::list<block_manager<>::write_ref> spine_; std::list<block_manager<>::write_ref> spine_;
block_address root_; block_address root_;
}; };

2
persistent-data/space-maps/subtracting_span_iterator.h
View File

@ -11,7 +11,7 @@
namespace persistent_data { namespace persistent_data {
class subtracting_span_iterator : public space_map::span_iterator { class subtracting_span_iterator : public space_map::span_iterator {
public: public:
typedef typename base::run_set<block_address> block_set; typedef base::run_set<block_address> block_set;
typedef space_map::span span; typedef space_map::span span;
subtracting_span_iterator(block_address max, subtracting_span_iterator(block_address max,

2
thin-provisioning/metadata.cc
View File

@ -42,7 +42,7 @@ namespace {
block_manager<>::ptr open_bm(string const &dev_path, bool writeable) { block_manager<>::ptr open_bm(string const &dev_path, bool writeable) {
block_address nr_blocks = get_nr_blocks(dev_path); block_address nr_blocks = get_nr_blocks(dev_path);
typename block_io<>::mode m = writeable ? block_io<>::mode m = writeable ?
block_io<>::READ_WRITE : block_io<>::READ_WRITE :
block_io<>::READ_ONLY; block_io<>::READ_ONLY;

2
thin-provisioning/metadata_dumper.cc
View File

@ -139,7 +139,7 @@ namespace {
class details_extractor : public btree<1, device_tree_detail::device_details_traits>::visitor { class details_extractor : public btree<1, device_tree_detail::device_details_traits>::visitor {
public: public:
typedef typename btree<1, device_tree_detail::device_details_traits>::visitor::node_location node_location; typedef btree<1, device_tree_detail::device_details_traits>::visitor::node_location node_location;
typedef boost::shared_ptr<details_extractor> ptr; typedef boost::shared_ptr<details_extractor> ptr;
typedef btree_checker<1, device_tree_detail::device_details_traits> checker; typedef btree_checker<1, device_tree_detail::device_details_traits> checker;

15
thin-provisioning/thin_check.cc
View File

@ -144,7 +144,7 @@ namespace {
block_manager<>::ptr block_manager<>::ptr
open_bm(string const &path) { open_bm(string const &path) {
block_address nr_blocks = get_nr_blocks(path); block_address nr_blocks = get_nr_blocks(path);
typename block_io<>::mode m = block_io<>::READ_ONLY; block_io<>::mode m = block_io<>::READ_ONLY;
return block_manager<>::ptr(new block_manager<>(path, nr_blocks, 1, m)); return block_manager<>::ptr(new block_manager<>(path, nr_blocks, 1, m));
} }
@ -344,13 +344,12 @@ namespace {
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int c; int c;
flags fs = { flags fs;
.check_device_tree = true, fs.check_device_tree = true;
.check_mapping_tree_level1 = true, fs.check_mapping_tree_level1 = true,
.check_mapping_tree_level2 = true, fs.check_mapping_tree_level2 = true,
.ignore_non_fatal_errors = false, fs.ignore_non_fatal_errors = false,
.quiet = false fs.quiet = false;
};
char const shortopts[] = "qhV"; char const shortopts[] = "qhV";
option const longopts[] = { option const longopts[] = {

3
thin-provisioning/thin_dump.cc
View File

@ -94,7 +94,8 @@ int main(int argc, char **argv)
char *end_ptr; char *end_ptr;
string format = "xml"; string format = "xml";
block_address metadata_snap = 0; block_address metadata_snap = 0;
struct flags flags = { .find_metadata_snap = false, .repair = false }; struct flags flags;
flags.find_metadata_snap = flags.repair = false;
const struct option longopts[] = { const struct option longopts[] = {
{ "help", no_argument, NULL, 'h'}, { "help", no_argument, NULL, 'h'},

2
thin-provisioning/thin_rmap.cc
View File

@ -23,7 +23,7 @@ namespace {
block_manager<>::ptr block_manager<>::ptr
open_bm(string const &path) { open_bm(string const &path) {
block_address nr_blocks = get_nr_blocks(path); block_address nr_blocks = get_nr_blocks(path);
typename block_io<>::mode m = block_io<>::READ_ONLY; block_io<>::mode m = block_io<>::READ_ONLY;
return block_manager<>::ptr(new block_manager<>(path, nr_blocks, 1, m)); return block_manager<>::ptr(new block_manager<>(path, nr_blocks, 1, m));
} }