diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-16 10:49:40 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-16 10:49:46 +0100 |
| commit | fd9356ba4eb5b3053caf506c750ec4cecb761b6d (patch) | |
| tree | 11f1790c116ab655e2204f52f317c783ae1ea167 /src/wallet | |
| parent | e1060c56cca7eeab8e217eb7b416c16487fd175e (diff) | |
| parent | c0cf48d1ac5b661aa1dfbcd284c773f8f5bbe806 (diff) | |
| download | bitcoin-fd9356ba4eb5b3053caf506c750ec4cecb761b6d.tar.xz | |
Merge pull request #7322
c0cf48d c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally (Cory Fields)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/walletdb.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 5266946ca0..67511976df 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -15,11 +15,6 @@ #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> |