From 48aec0f093ff6494a3e4f7cd5166cb4a27c16814 Mon Sep 17 00:00:00 2001 From: Johann Klähn Date: Sun, 10 May 2015 12:45:28 +0200 Subject: boost::none_t no longer convertible from literal 0 in 1.58 Instead we use boost::none, which has been documented since boost 1.34.0. --- src/account.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/account.h') 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_; 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() { -- cgit v1.2.3