Merge pull request #7322

c0cf48d c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan
2016-01-16 10:49:40 +01:00
2 changed files with 12 additions and 6 deletions

View File

@@ -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>