Merge pull request #318 from joegallo/master

Compilation errors with boost 1.56
This commit is contained in:
John Wiegley 2014-08-26 14:14:02 -05:00
commit 439923368b
5 changed files with 5 additions and 5 deletions

View file

@ -261,7 +261,7 @@ public:
mutable optional<xdata_t> xdata_; mutable optional<xdata_t> xdata_;
bool has_xdata() const { bool has_xdata() const {
return xdata_; return xdata_ != NULL;
} }
void clear_xdata(); void clear_xdata();
xdata_t& xdata() { xdata_t& xdata() {

View file

@ -191,7 +191,7 @@ public:
static bool use_aux_date; static bool use_aux_date;
virtual bool has_date() const { virtual bool has_date() const {
return _date; return _date != NULL;
} }
virtual date_t date() const { virtual date_t date() const {

View file

@ -205,7 +205,7 @@ public:
mutable optional<xdata_t> xdata_; mutable optional<xdata_t> xdata_;
bool has_xdata() const { bool has_xdata() const {
return xdata_; return xdata_ != NULL;
} }
void clear_xdata() { void clear_xdata() {
xdata_ = none; xdata_ = none;

View file

@ -80,7 +80,7 @@ void format_ptree::flush()
switch (format) { switch (format) {
case FORMAT_XML: case FORMAT_XML:
property_tree::xml_writer_settings<char> indented(' ', 2); auto indented = property_tree::xml_writer_make_settings<std::string> (' ', 2);
property_tree::write_xml(out, pt, indented); property_tree::write_xml(out, pt, indented);
out << std::endl; out << std::endl;
break; break;

View file

@ -568,7 +568,7 @@ public:
void stabilize(const optional<date_t>& date = none); void stabilize(const optional<date_t>& date = none);
bool is_valid() const { bool is_valid() const {
return start; return start != NULL;
} }
/** Find the current or next period containing date. Returns false if /** Find the current or next period containing date. Returns false if