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

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +6 -1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2e0a03ac1f - Show all commits

7
src/thread/context.hpp
View file

@ -1,6 +1,5 @@
#pragma once #pragma once
#include <fc/thread/thread.hpp> #include <fc/thread/thread.hpp>
#include <boost/context/all.hpp>
#include <fc/exception/exception.hpp> #include <fc/exception/exception.hpp>
#include <vector> #include <vector>
@ -9,6 +8,12 @@
#define BOOST_COROUTINES_NO_DEPRECATION_WARNING // Boost 1.61 #define BOOST_COROUTINES_NO_DEPRECATION_WARNING // Boost 1.61
#define BOOST_COROUTINE_NO_DEPRECATION_WARNING // Boost 1.62 #define BOOST_COROUTINE_NO_DEPRECATION_WARNING // Boost 1.62
#if BOOST_VERSION >= 106800
#include <boost/context/continuation_fcontext.hpp>
#else
#include <boost/context/all.hpp>
#endif
#if BOOST_VERSION >= 106100 #if BOOST_VERSION >= 106100
#include <boost/coroutine/stack_allocator.hpp> #include <boost/coroutine/stack_allocator.hpp>
namespace bc = boost::context::detail; namespace bc = boost::context::detail;