Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #if for boost versions > 2

Browse source
This commit is contained in:
John Jones 2018-11-13 16:06:59 -05:00
parent 5c0ee5d6b7
commit fd345e5bc2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/stacktrace.cpp
View file

@ -5,7 +5,7 @@
#include <boost/version.hpp>
// only include stacktrace stuff if boost >= 1.65 and not macOS
#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65 && !defined(__APPLE__)
#if BOOST_VERSION / 100 >= 1065 && !defined(__APPLE__)
#include <signal.h>
#include <fc/log/logger.hpp>
#include <boost/stacktrace.hpp>

6
tests/stacktrace_test.cpp
View file

@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(stacktrace_test)
std::stringstream ss;
fc::print_stacktrace(ss);
std::string results = ss.str();
#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65
#if BOOST_VERSION / 100 >= 1065 && !defined(__APPLE__)
BOOST_CHECK(!results.empty());
BOOST_CHECK(results.find("fc::print_stacktrace") != std::string::npos);
#else
@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(threaded_stacktrace_test)
return ss.str();
}
).wait();
#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65
#if BOOST_VERSION / 100 >= 1065 && !defined(__APPLE__)
BOOST_CHECK(!results.empty());
BOOST_CHECK(results.find("fc::print_stacktrace") != std::string::npos);
#else
@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(threaded_stacktrace_test)
#endif
}
#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65
#if BOOST_VERSION / 100 >= 1065 && !defined(__APPLE__)
class _svdt_visitor
{
public: