Revert "fix "no viable conversion from ... to 'bool'""

This reverts commit df9ae3ab9b.
This commit is contained in:
John Wiegley 2014-08-27 11:56:14 -05:00
parent 4ed6599579
commit 948f5fea28
4 changed files with 4 additions and 4 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_ != NULL; return xdata_;
} }
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 != NULL; return _date;
} }
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_ != NULL; return xdata_;
} }
void clear_xdata() { void clear_xdata() {
xdata_ = none; xdata_ = none;

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 != NULL; return start;
} }
/** Find the current or next period containing date. Returns false if /** Find the current or next period containing date. Returns false if