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

Update boost libraries

Browse source
This commit is contained in:
serkixenos 2022-02-20 23:57:37 -04:00
parent 44d285d91f
commit 059100f36f
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -40,7 +40,7 @@ endif()
SET (ORIGINAL_LIB_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) SET (ORIGINAL_LIB_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
SET(BOOST_COMPONENTS) SET(BOOST_COMPONENTS)
LIST(APPEND BOOST_COMPONENTS thread date_time filesystem system program_options signals serialization chrono unit_test_framework context locale iostreams) LIST(APPEND BOOST_COMPONENTS thread date_time filesystem system program_options serialization chrono unit_test_framework context locale iostreams)
SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" ) SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
IF( ECC_IMPL STREQUAL openssl ) IF( ECC_IMPL STREQUAL openssl )
@ -415,7 +415,7 @@ if(MSVC)
endif(MSVC) endif(MSVC)
IF(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY MATCHES "\\.(a|lib)$") IF(Boost_UNIT_TEST_FRAMEWORK_LIBRARY MATCHES "\\.(so|dll)$" OR FC_BUILD_DYNAMIC_LIBRARIES)
IF(MSVC) IF(MSVC)
add_definitions(/DBOOST_TEST_DYN_LINK) add_definitions(/DBOOST_TEST_DYN_LINK)
ELSE(MSVC) ELSE(MSVC)

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;