From 948f5fea2818df2e4793557505914bbc859fc193 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 27 Aug 2014 11:56:14 -0500 Subject: Revert "fix "no viable conversion from ... to 'bool'"" This reverts commit df9ae3ab9b37fde803f26c6bc4eaadfd67fc1d07. --- src/account.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/account.h') diff --git a/src/account.h b/src/account.h index 4a4041b7..d1377c39 100644 --- a/src/account.h +++ b/src/account.h @@ -261,7 +261,7 @@ public: mutable optional xdata_; bool has_xdata() const { - return xdata_ != NULL; + return xdata_; } void clear_xdata(); xdata_t& xdata() { -- cgit v1.2.3