From 67b1acbf7835fed57702f452156fa176a4c92aa3 Mon Sep 17 00:00:00 2001 From: seelabs Date: Sat, 14 May 2016 22:21:42 -0400 Subject: [PATCH] Resolve warnings: Add boost to system path when compiling with clang. Remove check for null for a var that can never be null. --- SConstruct | 2 +- src/ripple/ledger/impl/TxMeta.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index c337f93a3..a978da93a 100644 --- a/SConstruct +++ b/SConstruct @@ -457,7 +457,7 @@ def add_boost_and_protobuf(toolchain, env): os.path.join(BOOST_ROOT, 'stage', 'lib'), ]) env['BOOST_ROOT'] = BOOST_ROOT - if toolchain == 'gcc': + if toolchain in ['gcc', 'clang']: env.Append(CCFLAGS=['-isystem' + env['BOOST_ROOT']]) else: env.Append(CPPPATH=[ diff --git a/src/ripple/ledger/impl/TxMeta.cpp b/src/ripple/ledger/impl/TxMeta.cpp index 9d6275e38..1a5601863 100644 --- a/src/ripple/ledger/impl/TxMeta.cpp +++ b/src/ripple/ledger/impl/TxMeta.cpp @@ -170,7 +170,6 @@ TxMeta::getAffectedAccounts() const STObject& TxMeta::getAffectedNode (SLE::ref node, SField const& type) { - assert (&type); uint256 index = node->getIndex (); for (auto& n : mNodes) {