From a78e7358ecda264175e7bc00bb5e87b9348600a8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 17 May 2015 17:50:45 -0500 Subject: Revert "boost::none_t no longer convertible from literal 0 in 1.58" This reverts commit 48aec0f093ff6494a3e4f7cd5166cb4a27c16814. --- src/account.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/account.h') diff --git a/src/account.h b/src/account.h index 8d0fb1db..7fae93e1 100644 --- a/src/account.h +++ b/src/account.h @@ -261,7 +261,11 @@ public: mutable optional 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() { -- cgit v1.2.3