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

Get tools building with g++ 4.8.1

Browse Source
This commit is contained in:
Joe Thornber
2013-06-25 13:48:02 +01:00
parent 7b603183df
commit eb8d4c6f0b
11 changed files with 45 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
thin-provisioning/xml_format.cc
View File

@@ -27,7 +27,6 @@
#include <stdexcept>
#include <string.h>
using namespace boost;
using namespace std;
using namespace thin_provisioning;
@@ -51,7 +50,7 @@ namespace {
uint64_t trans_id,
uint32_t data_block_size,
uint64_t nr_data_blocks,
optional<uint64_t> metadata_snap) {
boost::optional<uint64_t> metadata_snap) {
indent();
out_ << "<superblock uuid=\"" << uuid << "\""
<< " time=\"" << time << "\""
@@ -178,17 +177,17 @@ namespace {
throw runtime_error(out.str());
}
return lexical_cast<T>(it->second);
return boost::lexical_cast<T>(it->second);
}
template <typename T>
optional<T> get_opt_attr(attributes const &attr, string const &key) {
typedef optional<T> rtype;
boost::optional<T> get_opt_attr(attributes const &attr, string const &key) {
typedef boost::optional<T> rtype;
attributes::const_iterator it = attr.find(key);
if (it == attr.end())
return rtype();
return rtype(lexical_cast<T>(it->second));
return rtype(boost::lexical_cast<T>(it->second));
}
void parse_superblock(emitter *e, attributes const &attr) {