Skip to content

Commit 502ebaa

Browse files
cho-mclonker
authored andcommitted
Add support for upcoming Boost 1.88.0
Boost.Process will make v2 the default in Boost 1.88.0[^1] which breaks compilation of prior code. For a simple fix, this commit updates to use the newer paths for v1 until the code is updated to use v2 API. [^1]: boostorg/process@2ccd97c
1 parent 55506a9 commit 502ebaa

File tree

5 files changed

+39
-0
lines changed

5 files changed

+39
-0
lines changed

Diff for: libsolidity/formal/ModelChecker.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@
1818

1919
#include <libsolidity/formal/ModelChecker.h>
2020

21+
#include <boost/version.hpp>
22+
#if (BOOST_VERSION < 108800)
2123
#include <boost/process.hpp>
24+
#else
25+
#define BOOST_PROCESS_VERSION 1
26+
#include <boost/process/v1/search_path.hpp>
27+
#endif
2228

2329
#include <range/v3/algorithm/any_of.hpp>
2430
#include <range/v3/view.hpp>

Diff for: libsolidity/interface/SMTSolverCommand.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@
2020
#include <liblangutil/Exceptions.h>
2121

2222
#include <boost/algorithm/string/join.hpp>
23+
#include <boost/version.hpp>
24+
#if (BOOST_VERSION < 108800)
2325
#include <boost/process.hpp>
26+
#else
27+
#define BOOST_PROCESS_VERSION 1
28+
#include <boost/process/v1/child.hpp>
29+
#include <boost/process/v1/io.hpp>
30+
#include <boost/process/v1/pipe.hpp>
31+
#include <boost/process/v1/search_path.hpp>
32+
#endif
2433

2534
namespace solidity::frontend
2635
{

Diff for: test/libyul/ControlFlowGraphTest.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@
2929
#include <libsolutil/Visitor.h>
3030

3131
#ifdef ISOLTEST
32+
#include <boost/version.hpp>
33+
#if (BOOST_VERSION < 108800)
3234
#include <boost/process.hpp>
35+
#else
36+
#define BOOST_PROCESS_VERSION 1
37+
#include <boost/process/v1/child.hpp>
38+
#include <boost/process/v1/io.hpp>
39+
#include <boost/process/v1/pipe.hpp>
40+
#endif
3341
#endif
3442

3543
using namespace solidity;

Diff for: test/libyul/SSAControlFlowGraphTest.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,15 @@
2828
#include <libyul/YulStack.h>
2929

3030
#ifdef ISOLTEST
31+
#include <boost/version.hpp>
32+
#if (BOOST_VERSION < 108800)
3133
#include <boost/process.hpp>
34+
#else
35+
#define BOOST_PROCESS_VERSION 1
36+
#include <boost/process/v1/child.hpp>
37+
#include <boost/process/v1/io.hpp>
38+
#include <boost/process/v1/pipe.hpp>
39+
#endif
3240
#endif
3341

3442
using namespace solidity;

Diff for: test/libyul/StackLayoutGeneratorTest.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,15 @@
3333
#include <range/v3/view/reverse.hpp>
3434

3535
#ifdef ISOLTEST
36+
#include <boost/version.hpp>
37+
#if (BOOST_VERSION < 108800)
3638
#include <boost/process.hpp>
39+
#else
40+
#define BOOST_PROCESS_VERSION 1
41+
#include <boost/process/v1/child.hpp>
42+
#include <boost/process/v1/io.hpp>
43+
#include <boost/process/v1/pipe.hpp>
44+
#endif
3745
#endif
3846

3947
using namespace solidity;

0 commit comments

Comments
 (0)