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

Remove ambiguity between boost::uint64_t and ::uint64_t.

Browse Source 
This has been causing people problems on uclibc builds.
This commit is contained in:
Joe Thornber
2014-07-02 08:19:20 +00:00
parent 9d63576ed3
commit e77e8715b0
7 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
era/superblock.cc
View File

@@ -4,7 +4,6 @@
#include "persistent-data/errors.h"
using namespace base;
using namespace boost;
using namespace era;
using namespace superblock_damage;
using namespace persistent_data;
@@ -149,8 +148,8 @@ superblock_traits::unpack(disk_type const &disk, value_type &value)
block_address ms = to_cpu<uint64_t>(disk.metadata_snap);
value.metadata_snap = (ms == SUPERBLOCK_LOCATION) ?
optional<block_address>() :
optional<block_address>(ms);
boost::optional<block_address>() :
boost::optional<block_address>(ms);
}
void

5
era/writeset_tree.cc
View File

@@ -2,7 +2,6 @@
#include "persistent-data/data-structures/btree_damage_visitor.h"
#include "persistent-data/data-structures/bitset.h"
using namespace boost;
using namespace era;
using namespace writeset_tree_detail;
using namespace persistent_data;
@@ -90,8 +89,8 @@ namespace {
private:
template <typename T>
run<uint32_t> to_uint32(run<T> const &r) {
return run<uint32_t>(optional<uint32_t>(r.begin_),
optional<uint32_t>(r.end_));
return run<uint32_t>(boost::optional<uint32_t>(r.begin_),
boost::optional<uint32_t>(r.end_));
}
damage_visitor &v_;