diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-07-27 18:11:19 -0700 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-07-27 18:11:19 -0700 |
| commit | 21c3569a70c675c388f0d349a6ba8512d3c141aa (patch) | |
| tree | eee91e88c78ad7eb936272697261dbdea1ec3769 /src/account.h | |
| parent | 5b31641a75c3b603d53350965ff4867ac05f77e5 (diff) | |
| parent | bcaca24de4264f89a94069701361988007e22e58 (diff) | |
| download | fork-ledger-21c3569a70c675c388f0d349a6ba8512d3c141aa.tar.gz fork-ledger-21c3569a70c675c388f0d349a6ba8512d3c141aa.tar.bz2 fork-ledger-21c3569a70c675c388f0d349a6ba8512d3c141aa.zip | |
Merge pull request #422 from jwakely/issue-417
Convert boost::optional objects to bool explicitly.
Diffstat (limited to 'src/account.h')
| -rw-r--r-- | src/account.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/account.h b/src/account.h index 7fae93e1..7de4e560 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 static_cast<bool>(xdata_); } void clear_xdata(); xdata_t& xdata() { |