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

15
caching/cache_metadata_size.cc
View File

@@ -7,7 +7,6 @@
#include <stdint.h>
#include <stdexcept>
using namespace boost;
using namespace std;
//----------------------------------------------------------------
@@ -18,9 +17,9 @@ namespace {
: max_hint_width(4) {
}
optional<uint64_t> device_size;
optional<uint32_t> block_size;
optional<uint64_t> nr_blocks;
boost::optional<uint64_t> device_size;
boost::optional<uint32_t> block_size;
boost::optional<uint64_t> nr_blocks;
uint32_t max_hint_width;
};
@@ -58,19 +57,19 @@ namespace {
while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) {
switch (c) {
case 0:
fs.block_size = lexical_cast<uint32_t>(optarg);
fs.block_size = boost::lexical_cast<uint32_t>(optarg);
break;
case 1:
fs.device_size = lexical_cast<uint64_t>(optarg);
fs.device_size = boost::lexical_cast<uint64_t>(optarg);
break;
case 2:
fs.nr_blocks = lexical_cast<uint64_t>(optarg);
fs.nr_blocks = boost::lexical_cast<uint64_t>(optarg);
break;
case 3:
fs.max_hint_width = lexical_cast<uint32_t>(optarg);
fs.max_hint_width = boost::lexical_cast<uint32_t>(optarg);
break;
case 'h':

7
caching/xml_format.cc
View File

@@ -5,7 +5,6 @@
#include <boost/lexical_cast.hpp>
#include <expat.h>
using namespace boost;
using namespace caching;
using namespace persistent_data;
using namespace std;
@@ -189,14 +188,14 @@ namespace {
block_address cblock = get_attr<uint64_t>(attr, "cache_block");
decoded_or_error doe = base64_decode(get_attr<string>(attr, "data"));
if (!get<vector<unsigned char> >(&doe)) {
if (!boost::get<vector<unsigned char> >(&doe)) {
ostringstream msg;
msg << "invalid base64 encoding of hint for cache block "
<< cblock << ": " << get<string>(doe);
<< cblock << ": " << boost::get<string>(doe);
throw runtime_error(msg.str());
}
e->hint(cblock, get<vector<unsigned char> >(doe));
e->hint(cblock, boost::get<vector<unsigned char> >(doe));
}
// FIXME: why passing e by ptr?