diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-12-13 15:39:11 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-12-13 15:39:32 +0100 |
| commit | ddecb671f0a41eaa8e6198f7e55172c1256bd978 (patch) | |
| tree | 1e9fc4a10ec452172531492599c146235fa25160 /src | |
| parent | 988fe5b1adc0cb551dfacd7d3eedf4bd7edc918a (diff) | |
| parent | a64e97dd476bda7c7981979d045b0d06d6f7ce47 (diff) | |
| download | bitcoin-ddecb671f0a41eaa8e6198f7e55172c1256bd978.tar.xz | |
Merge #17654: Unbreak build with Boost 1.72.0
a64e97dd476bda7c7981979d045b0d06d6f7ce47 wallet: unbreak with boost 1.72 (Jan Beich)
Pull request description:
Regressed by https://github.com/boostorg/filesystem/commit/9a14c37d6f95. See [error log](http://package22.nyi.freebsd.org/data/113amd64-default-PR241449/2019-11-27_11h48m22s/logs/bitcoin-0.19.0.1.log).
https://github.com/bitcoin/bitcoin/blob/35eda631ed3bd23d4a41761a85a96f925d4a6337/src/fs.h#L14
ACKs for top commit:
MarcoFalke:
ACK a64e97dd476bda7c7981979d045b0d06d6f7ce47
Tree-SHA512: 0aad2b8ec211bb81021a2f8cd2059364f949be716ebaf154dd97d5c2f7119f42553892e90e6c375018ff2155b996690c7520374762259778de88014cb531ad3b
Diffstat (limited to 'src')
| -rw-r--r-- | src/fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -11,7 +11,6 @@ #include <ext/stdio_filebuf.h> #endif -#define BOOST_FILESYSTEM_NO_DEPRECATED #include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> |