Revert "boost::none_t no longer convertible from literal 0 in 1.58"

This reverts commit 48aec0f093.
This commit is contained in:
John Wiegley 2015-05-17 17:50:45 -05:00
parent 7df6a515e2
commit a78e7358ec
5 changed files with 21 additions and 5 deletions

View file

@ -261,7 +261,11 @@ public:
mutable optional<xdata_t> xdata_;
bool has_xdata() const {
return xdata_ != boost::none;
#if BOOST_VERSION >= 105600
return xdata_ != NULL;
#else
return xdata_;
#endif
}
void clear_xdata();
xdata_t& xdata() {

View file

@ -174,7 +174,11 @@ public:
static bool use_aux_date;
virtual bool has_date() const {
return _date != boost::none;
#if BOOST_VERSION >= 105600
return _date != NULL;
#else
return _date;
#endif
}
virtual date_t date() const {

View file

@ -118,7 +118,7 @@ public:
ptr_op_t parse(std::istream& in,
const parse_flags_t& flags = PARSE_DEFAULT,
const optional<string>& original_string = boost::none);
const optional<string>& original_string = NULL);
};
} // namespace ledger

View file

@ -205,7 +205,11 @@ public:
mutable optional<xdata_t> xdata_;
bool has_xdata() const {
return xdata_ != boost::none;
#if BOOST_VERSION >= 105600
return xdata_ != NULL;
#else
return xdata_;
#endif
}
void clear_xdata() {
xdata_ = none;

View file

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