diff options
| author | fanquake <fanquake@gmail.com> | 2020-09-03 11:38:17 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-09-03 11:43:10 +0800 |
| commit | 9876ab8c74efe7cf7ebccb2b90b52e7b5957524f (patch) | |
| tree | 1c7d5dfc2ed7b47d08dc72f762d97d5daa47becb | |
| parent | 2d4574aad84aa98d39e7777b63d702f59026ca24 (diff) | |
| parent | e36f802fa4916586b53a989c0848389ad838b846 (diff) | |
Merge #19844: remove usage of boost::bind
e36f802fa4916586b53a989c0848389ad838b846 lint: add C++ code linter (fanquake)
c4be50fea31e85f0e7151ed5ecaba531f6f929db remove usage of boost::bind (fanquake)
Pull request description:
`boost::bind` usage was removed in #13743. However a new usage snuck in as
part of 2bc4c3eaf96f5f8490fc79280422916c5d14cde3 (#15225).
ACKs for top commit:
hebasto:
ACK e36f802fa4916586b53a989c0848389ad838b846
practicalswift:
ACK e36f802fa4916586b53a989c0848389ad838b846 -- patch looks correct
Tree-SHA512: 2b0387c5443c184bcbf7df4849db1ed1296ff82c7b4ff0aff18334a400e56a472a972d18234d3866531a088d7a8da64688e58dc9f15daaad4048697c759d55ce
| -rw-r--r-- | src/qt/walletmodel.cpp | 2 | ||||
| -rwxr-xr-x | test/lint/lint-cpp.sh | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 0556895948..6a3f903206 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -413,7 +413,7 @@ void WalletModel::subscribeToCoreSignals() m_handler_transaction_changed = m_wallet->handleTransactionChanged(std::bind(NotifyTransactionChanged, this, std::placeholders::_1, std::placeholders::_2)); m_handler_show_progress = m_wallet->handleShowProgress(std::bind(ShowProgress, this, std::placeholders::_1, std::placeholders::_2)); m_handler_watch_only_changed = m_wallet->handleWatchOnlyChanged(std::bind(NotifyWatchonlyChanged, this, std::placeholders::_1)); - m_handler_can_get_addrs_changed = m_wallet->handleCanGetAddressesChanged(boost::bind(NotifyCanGetAddressesChanged, this)); + m_handler_can_get_addrs_changed = m_wallet->handleCanGetAddressesChanged(std::bind(NotifyCanGetAddressesChanged, this)); } void WalletModel::unsubscribeFromCoreSignals() diff --git a/test/lint/lint-cpp.sh b/test/lint/lint-cpp.sh new file mode 100755 index 0000000000..cac57b968d --- /dev/null +++ b/test/lint/lint-cpp.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2020 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# +# Check for various C++ code patterns we want to avoid. + +export LC_ALL=C + +EXIT_CODE=0 + +OUTPUT=$(git grep -E "boost::bind\(" -- "*.cpp" "*.h") +if [[ ${OUTPUT} != "" ]]; then + echo "Use of boost::bind detected. Use std::bind instead." + echo + echo "${OUTPUT}" + EXIT_CODE=1 +fi + +exit ${EXIT_CODE}
\ No newline at end of file |