From a285fee7577ca3db243305d4edc6098bdf6ab53f Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Tue, 30 Aug 2011 12:47:42 +0100 Subject: [PATCH] get unit-tests working with g++ 4.4 --- space_map_disk.h | 2 +- unit-tests/block_t.cc | 4 ++-- unit-tests/btree_t.cc | 13 ++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/space_map_disk.h b/space_map_disk.h index 395c03f..a5540e6 100644 --- a/space_map_disk.h +++ b/space_map_disk.h @@ -491,7 +491,7 @@ namespace persistent_data { block_address nr_blocks) { using namespace sm_disk_detail; - typename persistent_space_map::ptr sm( + typename sm_disk_detail::sm_disk::ptr sm( new sm_disk(tm)); sm->extend(nr_blocks); return sm; diff --git a/unit-tests/block_t.cc b/unit-tests/block_t.cc index c42c13e..654c937 100644 --- a/unit-tests/block_t.cc +++ b/unit-tests/block_t.cc @@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(different_block_sizes) BOOST_AUTO_TEST_CASE(read_validator_works) { - typename block_manager<4096>::block_manager::validator::ptr v(new zero_validator<4096>()); + block_manager<4096>::block_manager::validator::ptr v(new zero_validator<4096>()); auto bm = create_bm(64); bm->write_lock_zero(0); bm->read_lock(0, v); @@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE(read_validator_works) BOOST_AUTO_TEST_CASE(write_validator_works) { auto bm = create_bm(64); - typename block_manager<4096>::block_manager::validator::ptr v(new zero_validator<4096>()); + block_manager<4096>::block_manager::validator::ptr v(new zero_validator<4096>()); { auto wr = bm->write_lock(0, v); diff --git a/unit-tests/btree_t.cc b/unit-tests/btree_t.cc index 6b28e19..776927e 100644 --- a/unit-tests/btree_t.cc +++ b/unit-tests/btree_t.cc @@ -24,7 +24,7 @@ namespace { btree<1, uint64_traits, 4096>::ptr create_btree() { - typename uint64_traits::ref_counter rc; + uint64_traits::ref_counter rc; return btree<1, uint64_traits, 4096>::ptr( new btree<1, uint64_traits, 4096>( @@ -37,16 +37,19 @@ namespace { // class constraint_visitor : public btree<1, uint64_traits, 4096>::visitor { public: - void visit_internal(unsigned level, btree_detail::node_ref const &n) { + bool visit_internal(unsigned level, bool is_root, btree_detail::node_ref const &n) { check_duplicate_block(n.get_location()); + return true; } - void visit_internal_leaf(unsigned level, btree_detail::node_ref const &n) { + bool visit_internal_leaf(unsigned level, bool is_root, btree_detail::node_ref const &n) { check_duplicate_block(n.get_location()); + return true; } - void visit_leaf(unsigned level, btree_detail::node_ref const &n) { + bool visit_leaf(unsigned level, bool is_root, btree_detail::node_ref const &n) { check_duplicate_block(n.get_location()); + return true; } private: @@ -66,7 +69,7 @@ namespace { void check_constraints(btree<1, uint64_traits, 4096>::ptr tree) { typedef btree<1, uint64_traits, 4096> tree_type; - typename tree_type::visitor::ptr v(new constraint_visitor); + tree_type::visitor::ptr v(new constraint_visitor); tree->visit(v); } }