diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-07 08:55:56 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-07 08:56:03 +0100 |
| commit | 41f1a3e99bfac07fd4d719575fa93016a31d9551 (patch) | |
| tree | 3c0f10eaf55656dcf38442ea1b57f79306c9f914 /src/wallet/walletdb.cpp | |
| parent | 605c17844ea32b6d237db6d83871164dc7d59dab (diff) | |
| parent | 3968922b9623af9da9959adc49a779d6837e1f0c (diff) | |
| download | bitcoin-41f1a3e99bfac07fd4d719575fa93016a31d9551.tar.xz | |
Merge pull request #7302
3968922 c++11: fix libbdb build against libc++ in c++11 mode (Cory Fields)
57d2f62 c++11: CAccountingEntry must be defined before use in a list (Cory Fields)
89f71c6 c++11: don't throw from the reverselock destructor (Cory Fields)
76ac35f c++11: detect and correct for boost builds with an incompatible abi (Cory Fields)
Diffstat (limited to 'src/wallet/walletdb.cpp')
| -rw-r--r-- | src/wallet/walletdb.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 88dc3102da..f0e1776958 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -15,6 +15,12 @@ #include "utiltime.h" #include "wallet/wallet.h" +#if defined(FORCE_BOOST_EMULATED_SCOPED_ENUMS) +#define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_CXX11_SCOPED_ENUMS +#endif + +#include <boost/version.hpp> #include <boost/filesystem.hpp> #include <boost/foreach.hpp> #include <boost/scoped_ptr.hpp> |