From bcaca24de4264f89a94069701361988007e22e58 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 27 Jul 2015 20:37:16 +0100 Subject: Convert boost::optional objects to bool explicitly. Fixes #417. --- 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..7de4e560 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 static_cast(xdata_); } void clear_xdata(); xdata_t& xdata() { -- cgit v1.2.3