diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-09 21:07:10 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-09 21:07:13 +0200 |
| commit | dac5374ccee6b21605127a6f8000666aab5caecc (patch) | |
| tree | 8d974324eef46ed3c7117f7b5ae4528bddcf6dfd /src/net_processing.cpp | |
| parent | dac5d68fc6cf136e0d7b21b9ed4fa053d54e6059 (diff) | |
| parent | 9fd3e0001fc20eecbfa823e12f66da4054a072a7 (diff) | |
Merge #13455: [0.16.2] Backports
9fd3e0001fc20eecbfa823e12f66da4054a072a7 depends: Update Qt download url (fanquake)
f7401c86b9c9c58cfe57c2a49d3b4e00f80ded4a Fix parameter count check for importpubkey. (Kristaps Kaupe)
cbd2f70b75016bbadeb212c823b5c1ece95d5241 expose CBlockIndex::nTx in getblock(header) (Gregory Sanders)
ce8aa5491f35c2cca03ba1877cd4c926b506a961 Add Windows shutdown handler (Chun Kuan Lee)
18b0c69e2fc9f9d5cd56659abab467c2c6826be2 Bugfix: Include <memory> for std::unique_ptr (Luke Dashjr)
Pull request description:
Backports:
* #12859 Bugfix: Include <memory> for std::unique_ptr
* #13131 Add Windows shutdown handler
* #13451 rpc: expose CBlockIndex::nTx in getblock(header)
* #13507 RPC: Fix parameter count check for importpubkey
* #13544 depends: Update Qt download url
to the 0.16 branch.
Tree-SHA512: eeaec52d001d5c81e67dda3a2d3fee7a9445e569366e597b18e81d802c1b7f89e545afd53d094740c37c1714050304979398b9860144454d3a5cb5abc9e9eaca
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index f1260f3ae4..eb5c258049 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -30,6 +30,8 @@ #include <utilmoneystr.h> #include <utilstrencodings.h> +#include <memory> + #if defined(NDEBUG) # error "Bitcoin cannot be compiled without assertions." #endif |