diff options
| -rw-r--r-- | src/account.h | 6 | ||||
| -rw-r--r-- | src/item.h | 6 | ||||
| -rw-r--r-- | src/parser.h | 2 | ||||
| -rw-r--r-- | src/post.h | 6 | ||||
| -rw-r--r-- | src/times.h | 6 |
5 files changed, 5 insertions, 21 deletions
diff --git a/src/account.h b/src/account.h index 7fae93e1..8d0fb1db 100644 --- a/src/account.h +++ b/src/account.h @@ -261,11 +261,7 @@ public: mutable optional<xdata_t> xdata_; bool has_xdata() const { -#if BOOST_VERSION >= 105600 - return xdata_ != NULL; -#else - return xdata_; -#endif + return xdata_ != boost::none; } void clear_xdata(); xdata_t& xdata() { @@ -174,11 +174,7 @@ public: static bool use_aux_date; virtual bool has_date() const { -#if BOOST_VERSION >= 105600 - return _date != NULL; -#else - return _date; -#endif + return _date != boost::none; } virtual date_t date() const { diff --git a/src/parser.h b/src/parser.h index e46fc719..25c4a7e3 100644 --- a/src/parser.h +++ b/src/parser.h @@ -118,7 +118,7 @@ public: ptr_op_t parse(std::istream& in, const parse_flags_t& flags = PARSE_DEFAULT, - const optional<string>& original_string = NULL); + const optional<string>& original_string = boost::none); }; } // namespace ledger @@ -205,11 +205,7 @@ public: mutable optional<xdata_t> xdata_; bool has_xdata() const { -#if BOOST_VERSION >= 105600 - return xdata_ != NULL; -#else - return xdata_; -#endif + return xdata_ != boost::none; } void clear_xdata() { xdata_ = none; diff --git a/src/times.h b/src/times.h index 421d1462..cc980858 100644 --- a/src/times.h +++ b/src/times.h @@ -500,11 +500,7 @@ public: void stabilize(const optional<date_t>& date = none); bool is_valid() const { -#if BOOST_VERSION >= 105600 - return start != NULL; -#else - return start; -#endif + return start != boost::none; } /** Find the current or next period containing date. Returns false if |