diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-04-01 18:30:17 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-04-01 18:30:21 -0400 |
| commit | 0c5f67b8e5d9a502c6d321c5e0696bc3e9b4690d (patch) | |
| tree | 157e9d84196abfbdb59270e3829e6b0cb4c4bde2 /src/wallet | |
| parent | 9beded58606606b00e70ae76020ac433569b901e (diff) | |
| parent | 3bcc0059b82b1d482d499d4d8f09118617074a5b (diff) | |
Merge #12757: Clarify include guard naming convention
3bcc0059b8 Add lint-include-guards.sh which checks include guard consistency (practicalswift)
8fd6af89a0 Fix missing or inconsistent include guards (practicalswift)
8af65d96f4 Document include guard convention (practicalswift)
Pull request description:
* **Documentation**: Document include guard convention
* **Fix**: Fix missing or inconsistent include guards
* **Regression test**: Add `lint-include-guards.sh` which checks include guard consistency
Tree-SHA512: 8171878f60fd08ccbea943a11e835195750592abb9d7ab74eaa4265ae7fac523b1da9d31ca13d6ab73dd596e49986bfb7593c696e5f39567c93e610165bc2acc
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/coinselection.h | 6 | ||||
| -rw-r--r-- | src/wallet/test/wallet_test_fixture.h | 7 | ||||
| -rw-r--r-- | src/wallet/walletutil.h | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 4d1a43bc17..2b185879c6 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COINSELECTION_H -#define BITCOIN_COINSELECTION_H +#ifndef BITCOIN_WALLET_COINSELECTION_H +#define BITCOIN_WALLET_COINSELECTION_H #include <amount.h> #include <primitives/transaction.h> @@ -51,4 +51,4 @@ bool SelectCoinsBnB(std::vector<CInputCoin>& utxo_pool, const CAmount& target_va // Original coin selection algorithm as a fallback bool KnapsackSolver(const CAmount& nTargetValue, std::vector<CInputCoin>& vCoins, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet); -#endif // BITCOIN_COINSELECTION_H +#endif // BITCOIN_WALLET_COINSELECTION_H diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h index 663836a955..23575391c4 100644 --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_WALLET_TEST_FIXTURE_H -#define BITCOIN_WALLET_TEST_FIXTURE_H +#ifndef BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H +#define BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H #include <test/test_bitcoin.h> @@ -18,5 +18,4 @@ struct WalletTestingSetup: public TestingSetup { CWallet m_wallet; }; -#endif - +#endif // BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H diff --git a/src/wallet/walletutil.h b/src/wallet/walletutil.h index 50ff736402..f12acacd00 100644 --- a/src/wallet/walletutil.h +++ b/src/wallet/walletutil.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_WALLET_UTIL_H -#define BITCOIN_WALLET_UTIL_H +#ifndef BITCOIN_WALLET_WALLETUTIL_H +#define BITCOIN_WALLET_WALLETUTIL_H #include <chainparamsbase.h> #include <util.h> @@ -11,4 +11,4 @@ //! Get the path of the wallet directory. fs::path GetWalletDir(); -#endif // BITCOIN_WALLET_UTIL_H +#endif // BITCOIN_WALLET_WALLETUTIL_H |