Skip to content

Commit

Permalink
require latest boost with c++20
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Andriushchenko committed Nov 13, 2024
1 parent 66dde3f commit 0f35965
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ git clone https://github.com/moves-rwth/storm.git storm
mkdir -p ${PREREQUISITES}/storm/build
cd ${PREREQUISITES}/storm/build
cmake ..
make storm storm-pomdp storm-counterexamples --jobs ${COMPILE_JOBS}
make storm storm-cli storm-pomdp --jobs ${COMPILE_JOBS}
# make check --jobs ${COMPILE_JOBS}

# setup and activate python environment
Expand Down
11 changes: 1 addition & 10 deletions payntbind/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,7 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
# which is recommended *not* to do, but leads to errors otherwise.
set(CMAKE_CXX_VISIBILITY_PRESET "default")


# Workaround for issue with Boost >= 1.81
find_package(Boost 1.65.1 QUIET REQUIRED COMPONENTS filesystem system)
if (Boost_FOUND)
if (${Boost_VERSION} VERSION_GREATER_EQUAL "1.81.0")
message(STATUS "Stormpy - Using workaround for Boost >= 1.81")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_PHOENIX_STL_TUPLE_H_")
endif()
endif ()

find_package(Boost 1.86 REQUIRED) #+

# Set configurations
set(STORM_VERSION ${storm_VERSION})
Expand Down
2 changes: 1 addition & 1 deletion payntbind/src/synthesis/quotient/ColoringSmt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ std::pair<bool,std::vector<std::vector<uint64_t>>> ColoringSmt<ValueType>::areCh
}
STORM_LOG_THROW(harmonizing_hole_found, storm::exceptions::UnexpectedException, "harmonized UNSAT core is not SAT");*/

solver.add(0 <= harmonizing_variable and harmonizing_variable < family.numHoles(), "harmonizing_domain");
solver.add(0 <= harmonizing_variable and harmonizing_variable < (int)(family.numHoles()), "harmonizing_domain");
consistent = check();
STORM_LOG_THROW(consistent, storm::exceptions::UnexpectedException, "harmonized UNSAT core is not SAT");
model = solver.get_model();
Expand Down

0 comments on commit 0f35965

Please sign in to comment.