Skip to content

Commit

Permalink
build: require boost >= 1.71.0
Browse files Browse the repository at this point in the history
Refs: #5276
Change-Id: Ia1014604d6933ca0042cecbaa25e8df2e7e2356c
  • Loading branch information
Pesa committed Sep 24, 2023
1 parent 0b272e0 commit 690272d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 4 additions & 8 deletions tests/io-fixture.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2013-2022 Regents of the University of California
* The University of Memphis
* Copyright (c) 2013-2023, Regents of the University of California,
* The University of Memphis.
*
* This file is part of PSync.
*
Expand All @@ -22,7 +22,7 @@

#include "tests/clock-fixture.hpp"

#include <boost/asio/io_service.hpp>
#include <boost/asio/io_context.hpp>

namespace psync::tests {

Expand All @@ -33,17 +33,13 @@ class IoFixture : public ClockFixture
afterTick() final
{
if (m_io.stopped()) {
#if BOOST_VERSION >= 106600
m_io.restart();
#else
m_io.reset();
#endif
}
m_io.poll();
}

protected:
boost::asio::io_service m_io;
boost::asio::io_context m_io;
};

} // namespace psync::tests
Expand Down
4 changes: 4 additions & 0 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ def configure(conf):
uselib_store='NDN_CXX', pkg_config_path=pkg_config_path)

conf.check_boost(lib='iostreams', mt=True)
if conf.env.BOOST_VERSION_NUMBER < 107100:
conf.fatal('The minimum supported version of Boost is 1.71.0.\n'
'Please upgrade your distribution or manually install a newer version of Boost.\n'
'For more information, see https://redmine.named-data.net/projects/nfd/wiki/Boost')

for scheme in COMPRESSION_SCHEMES:
if getattr(conf.options, f'without_{scheme}'):
Expand Down

0 comments on commit 690272d

Please sign in to comment.