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

Merge pull request #92 from bitshares/mac_stacktrace

Browse source 
boost stacktrace does not play well with mac
This commit is contained in:
John M. Jones 2018-11-21 06:35:44 -05:00 committed by GitHub
commit 0468884ea6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/stacktrace.cpp
View file

@ -4,8 +4,8 @@
#include <ostream>
#include <boost/version.hpp>
// only include stacktrace stuff if boost >= 1.65
#if BOOST_VERSION / 100000 >= 1 && ((BOOST_VERSION / 100) % 1000) >= 65
// only include stacktrace stuff if boost >= 1.65 and not macOS
#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: