From 7be695c6bd600e23b1ad82b296941392ad3ab257 Mon Sep 17 00:00:00 2001 From: Jeff Trull Date: Tue, 12 Aug 2014 11:20:31 -0700 Subject: [PATCH] Handle changes to boost::optional in newly released boost 1.56: To improve compatibility with the proposed std::optional a number of changes were made, one of which is the removal of the implicit conversion to bool. As a result, returning boost::optional as a bool value now fails. Explicit conversion to bool used for clarity. --- src/ripple/module/app/tx/TransactionMeta.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ripple/module/app/tx/TransactionMeta.h b/src/ripple/module/app/tx/TransactionMeta.h index 3970705a3..767e59e12 100644 --- a/src/ripple/module/app/tx/TransactionMeta.h +++ b/src/ripple/module/app/tx/TransactionMeta.h @@ -107,7 +107,7 @@ public: bool hasDeliveredAmount () const { - return mDelivered; + return bool(mDelivered); } static bool thread (STObject& node, uint256 const& prevTxID, std::uint32_t prevLgrID);