diff options
| author | Matt Corallo <git@bluematt.me> | 2017-01-19 16:15:41 -0500 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-04-07 11:53:43 +0200 |
| commit | 1c95e2f9c94f172ddddedeb1358953992f39f8bd (patch) | |
| tree | 8c88da5d96bbd4fb70b212f323707e39896d37b6 /src/wallet | |
| parent | 91f1e6ce5e7854435196464aace0dcf7ce21dd5a (diff) | |
| download | bitcoin-1c95e2f9c94f172ddddedeb1358953992f39f8bd.tar.xz | |
Use std::shared_ptr instead of boost::shared_ptr in ScriptForMining
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index b04037774d..dc145fd3d2 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3376,9 +3376,9 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx) } } -void CWallet::GetScriptForMining(boost::shared_ptr<CReserveScript> &script) +void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script) { - boost::shared_ptr<CReserveKey> rKey(new CReserveKey(this)); + std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this); CPubKey pubkey; if (!rKey->GetReservedKey(pubkey)) return; diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 127ffd6cf3..daae930399 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -28,8 +28,6 @@ #include <utility> #include <vector> -#include <boost/shared_ptr.hpp> - extern CWallet* pwalletMain; /** @@ -963,7 +961,7 @@ public: } } - void GetScriptForMining(boost::shared_ptr<CReserveScript> &script) override; + void GetScriptForMining(std::shared_ptr<CReserveScript> &script) override; unsigned int GetKeyPoolSize() { |