build: recommend boost >= 1.65.1
With this commit, Ubuntu 16.04 is no longer officially supported
and may require manual installation of a newer version of Boost.
Refs: #5087
Change-Id: I17197f72ee8f7cd4d0954658fe57c324076f1311
diff --git a/.jenkins.d/20-tests.sh b/.jenkins.d/20-tests.sh
index d4b9652..fb5d2dc 100755
--- a/.jenkins.d/20-tests.sh
+++ b/.jenkins.d/20-tests.sh
@@ -10,21 +10,6 @@
ndnsec-keygen "/tmp/jenkins/$NODE_NAME" | ndnsec-install-cert -
-BOOST_VERSION=$(python3 -c "import sys; sys.path.append('build/c4che'); import _cache; print(_cache.BOOST_VERSION_NUMBER);")
-
-ut_log_args() {
- if (( BOOST_VERSION >= 106200 )); then
- echo --logger=HRF,test_suite,stdout:XML,all,build/xunit-${1:-report}.xml
- else
- if [[ -n $XUNIT ]]; then
- echo --log_level=all $( (( BOOST_VERSION >= 106000 )) && echo -- ) \
- --log_format2=XML --log_sink2=build/xunit-${1:-report}.xml
- else
- echo --log_level=test_suite
- fi
- fi
-}
-
# https://github.com/google/sanitizers/wiki/AddressSanitizerFlags
ASAN_OPTIONS="color=always"
ASAN_OPTIONS+=":check_initialization_order=1"
@@ -37,6 +22,8 @@
export BOOST_TEST_BUILD_INFO=1
export BOOST_TEST_COLOR_OUTPUT=1
+export BOOST_TEST_DETECT_MEMORY_LEAK=0
+export BOOST_TEST_LOGGER=HRF,test_suite,stdout:XML,all,build/xunit-log.xml
# Run unit tests
-./build/unit-tests $(ut_log_args)
+./build/unit-tests
diff --git a/README-dev.md b/README-dev.md
index ad9447c..95b7ee1 100644
--- a/README-dev.md
+++ b/README-dev.md
@@ -2,7 +2,7 @@
============================
If you are new to the NDN community of software generally, read the
-[Contributor's Guide](https://github.com/named-data/NFD/blob/master/CONTRIBUTING.md).
+[Contributor's Guide](https://github.com/named-data/.github/blob/master/CONTRIBUTING.md).
Code style
----------
@@ -62,7 +62,7 @@
./build/unit-tests
-[Boost.Test framework](https://www.boost.org/doc/libs/1_58_0/libs/test/doc/html/index.html)
+The [Boost.Test framework](https://www.boost.org/doc/libs/1_65_1/libs/test/doc/html/index.html)
is very flexible and allows a number of run-time customization of what tests should be run.
For example, it is possible to choose to run only a specific test suite, only a specific
test case within a suite, or specific test cases within specific test suites:
@@ -94,9 +94,8 @@
./build/unit-tests -p
There are many more command line options available, information about which can be obtained
-either from the command line using `--help` switch, or online on
-[Boost.Test library](https://www.boost.org/doc/libs/1_58_0/libs/test/doc/html/index.html)
-website.
+either from the command line using the `--help` switch, or online on the
+[Boost.Test website](https://www.boost.org/doc/libs/1_65_1/libs/test/doc/html/index.html).
**Warning:** If you have customized parameters for NDN platform using `client.conf` in
`/etc/ndn` or `/usr/local/etc/ndn` (or other `@SYSCONFDIR@/etc` if it was configured to custom
diff --git a/README.md b/README.md
index c136bac..d26feab 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,10 @@
## Contributing
-You're encouraged to contribute to ndn-cxx! Check out the
-[Contributor's Guide](https://github.com/named-data/NFD/blob/master/CONTRIBUTING.md) to get started.
+We greatly appreciate contributions to the ndn-cxx code base.
+If you are new to the NDN software community, please read the
+[Contributor's Guide](https://github.com/named-data/.github/blob/master/CONTRIBUTING.md)
+to get started.
## License
diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst
index 5272847..9de5b90 100644
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -7,7 +7,6 @@
ndn-cxx is built against a continuous integration system and has been tested on the
following platforms:
-- Ubuntu 16.04 (amd64)
- Ubuntu 18.04 (amd64, armhf, i386)
- Ubuntu 19.10 (amd64)
- macOS 10.13
@@ -18,10 +17,10 @@
ndn-cxx is known to work on the following platforms, although they are not officially
supported:
-- Debian >= 9
+- Debian 10 (Buster)
- Fedora >= 29
- Gentoo Linux
-- Raspbian >= 2017-08-16
+- Raspbian >= 2019-06-20 (Buster)
- FreeBSD >= 11.3
Prerequisites
@@ -31,9 +30,9 @@
~~~~~~~~
- GCC >= 5.3 or clang >= 3.6
-- Python >= 3.5
+- Python >= 3.6
- pkg-config
-- Boost >= 1.58
+- Boost >= 1.65.1
- OpenSSL >= 1.0.2
- SQLite 3.x
diff --git a/docs/examples.rst b/docs/examples.rst
index 729a6c5..33657da 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -18,8 +18,7 @@
.. literalinclude:: ../examples/consumer.cpp
:language: c++
:linenos:
- :emphasize-lines: 24-27,39,43-47,51,58,75
-
+ :emphasize-lines: 39-45,48,59,65,71
Trivial producer
----------------
@@ -42,8 +41,7 @@
.. literalinclude:: ../examples/producer.cpp
:language: c++
:linenos:
- :emphasize-lines: 42,55-58,61,64,67,70,76
-
+ :emphasize-lines: 41,50,57-59,62,70,74
Consumer that uses Scheduler
----------------------------
@@ -52,19 +50,18 @@
events for execution at specific points of time.
The library internally uses `boost::asio::io_service
-<https://www.boost.org/doc/libs/1_58_0/doc/html/boost_asio/reference/io_service.html>`_ to
+<https://www.boost.org/doc/libs/1_65_1/doc/html/boost_asio/reference/io_service.html>`_ to
implement fully asynchronous NDN operations (i.e., sending and receiving Interests and
Data). In addition to network-related operations, ``boost::asio::io_service`` can be used
to execute any arbitrary callback within the processing thread (run either explicitly via
-``io.run`` or implicitly via :ndn-cxx:`Face::processEvents` as in previous examples).
-:ndn-cxx:`Scheduler` is just a wrapper on top of ``boost::asio::io_service``,
-allowing simple interface to schedule tasks at specific times.
+``io_service::run()`` or implicitly via :ndn-cxx:`Face::processEvents` as in previous
+examples). :ndn-cxx:`Scheduler` is just a wrapper on top of ``io_service``, providing a
+simple interface to schedule tasks at specific times.
The highlighted lines in the example demonstrate all that is needed to express a second
-Interest approximately 2 seconds after the first one.
+Interest approximately 3 seconds after the first one.
.. literalinclude:: ../examples/consumer-with-timer.cpp
:language: c++
:linenos:
- :emphasize-lines: 39-40,51-55,59-60,62-63,108-109
-
+ :emphasize-lines: 39-40,56,62,93,106,114-116
diff --git a/docs/tutorials/utils-ndn-regex.rst b/docs/tutorials/utils-ndn-regex.rst
index af107c0..52026ae 100644
--- a/docs/tutorials/utils-ndn-regex.rst
+++ b/docs/tutorials/utils-ndn-regex.rst
@@ -5,8 +5,8 @@
performed at two levels: the name level and the name component level.
A name component matcher, enclosed in ``<`` and ``>``, specifies the pattern of a name component. The
-component pattern is expressed with the `Perl Regular Expression Syntax
-<https://www.boost.org/doc/libs/1_58_0/libs/regex/doc/html/boost_regex/syntax/perl_syntax.html>`__.
+component pattern is expressed using the `Modified ECMAScript Regular Expression Syntax
+<https://en.cppreference.com/w/cpp/regex/ecmascript>`_.
For example, ``<ab*c>`` matches the 1st, 3rd, and 4th components of ``/ac/dc/abc/abbc``, but does
not match the 2nd component. A special case is that ``<>`` denotes a wildcard matcher that can match
**ANY** name component.
diff --git a/ndn-cxx/detail/common.hpp b/ndn-cxx/detail/common.hpp
index e80af57..5118887 100644
--- a/ndn-cxx/detail/common.hpp
+++ b/ndn-cxx/detail/common.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -112,7 +112,7 @@
#include <boost/assert.hpp>
#include <boost/concept_check.hpp>
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
namespace ndn {
using boost::noncopyable;
diff --git a/ndn-cxx/lp/packet.cpp b/ndn-cxx/lp/packet.cpp
index 9b84892..235a37a 100644
--- a/ndn-cxx/lp/packet.cpp
+++ b/ndn-cxx/lp/packet.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -22,7 +22,7 @@
#include "ndn-cxx/lp/packet.hpp"
#include "ndn-cxx/lp/fields.hpp"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
#include <boost/mpl/for_each.hpp>
#include <boost/range/adaptor/reversed.hpp>
diff --git a/ndn-cxx/util/logger.hpp b/ndn-cxx/util/logger.hpp
index 81c1076..6196d0c 100644
--- a/ndn-cxx/util/logger.hpp
+++ b/ndn-cxx/util/logger.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -233,22 +233,14 @@
struct ndn_cxx_allow_trailing_semicolon
/** \cond */
-#if BOOST_VERSION == 105900
-// workaround Boost bug 11549
-#define NDN_BOOST_LOG(x, sev) BOOST_LOG_SEV(x, sev) << ""
-#else
-#define NDN_BOOST_LOG(x, sev) BOOST_LOG_SEV(x, sev)
-#endif
-
// implementation detail
#define NDN_LOG_INTERNAL(lvl, expression) \
do { \
if (ndn_cxx_getLogger().isLevelEnabled(::ndn::util::LogLevel::lvl)) { \
- NDN_BOOST_LOG(ndn_cxx_getLogger(), ::ndn::util::LogLevel::lvl) \
+ BOOST_LOG_SEV(ndn_cxx_getLogger(), ::ndn::util::LogLevel::lvl) \
<< expression; \
} \
} while (false)
-
/** \endcond */
/** \brief Log at TRACE level.
diff --git a/ndn-cxx/util/scheduler.cpp b/ndn-cxx/util/scheduler.cpp
index 9cbe734..e4b15d8 100644
--- a/ndn-cxx/util/scheduler.cpp
+++ b/ndn-cxx/util/scheduler.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -99,7 +99,7 @@
if (!m_isEventExecuting && i == m_queue.begin()) {
// the new event is the first one to expire
- this->scheduleNext();
+ scheduleNext();
}
return EventId(*this, *i);
@@ -118,7 +118,7 @@
m_queue.erase(info->queueIt);
if (!m_isEventExecuting) {
- this->scheduleNext();
+ scheduleNext();
}
}
@@ -147,6 +147,8 @@
m_isEventExecuting = true;
+ // ASan reports a stack-use-after-scope on armhf when
+ // BOOST_SCOPE_EXIT_ALL is used in place of BOOST_SCOPE_EXIT
BOOST_SCOPE_EXIT(this_) {
this_->m_isEventExecuting = false;
this_->scheduleNext();
diff --git a/ndn-cxx/util/time.hpp b/ndn-cxx/util/time.hpp
index 5656b2a..ec15272 100644
--- a/ndn-cxx/util/time.hpp
+++ b/ndn-cxx/util/time.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -302,7 +302,7 @@
* \param format desired output format (default: `%Y-%m-%d %H:%M:%S`)
* \param locale desired locale (default: "C" locale)
*
- * \sa https://www.boost.org/doc/libs/1_58_0/doc/html/date_time/date_time_io.html#date_time.format_flags
+ * \sa https://www.boost.org/doc/libs/1_65_1/doc/html/date_time/date_time_io.html#date_time.format_flags
* describes possible formatting flags
**/
std::string
@@ -320,7 +320,7 @@
* \param format input output format (default: `%Y-%m-%d %H:%M:%S`)
* \param locale input locale (default: "C" locale)
*
- * \sa https://www.boost.org/doc/libs/1_58_0/doc/html/date_time/date_time_io.html#date_time.format_flags
+ * \sa https://www.boost.org/doc/libs/1_65_1/doc/html/date_time/date_time_io.html#date_time.format_flags
* describes possible formatting flags
*/
system_clock::TimePoint
diff --git a/tests/unit/boost-multi-log-formatter.hpp b/tests/unit/boost-multi-log-formatter.hpp
deleted file mode 100644
index 59e850e..0000000
--- a/tests/unit/boost-multi-log-formatter.hpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2015-2018 Regents of the University of California.
- *
- * Based on work by Martin Ba (http://stackoverflow.com/a/26718189)
- *
- * This file is distributed under the Boost Software License, Version 1.0.
- * (See http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef NDN_TESTS_UNIT_BOOST_MULTI_LOG_FORMATTER_HPP
-#define NDN_TESTS_UNIT_BOOST_MULTI_LOG_FORMATTER_HPP
-
-#include <boost/version.hpp>
-
-#if BOOST_VERSION >= 105900
-#include <boost/test/unit_test_parameters.hpp>
-#else
-#include <boost/test/detail/unit_test_parameters.hpp>
-#endif // BOOST_VERSION >= 105900
-
-#include <boost/test/unit_test_log_formatter.hpp>
-#include <boost/test/output/compiler_log_formatter.hpp>
-#include <boost/test/output/xml_log_formatter.hpp>
-
-namespace boost {
-namespace unit_test {
-namespace output {
-
-/**
- * @brief Log formatter for Boost.Test that outputs the logging to multiple formatters
- *
- * The log formatter is designed to output to one or multiple formatters at the same time. For
- * example, one HRF formatter can output to the standard output, while XML formatter output to
- * the file.
- *
- * Usage:
- *
- * // Call in init_unit_test_suite: (this will override the --log_format parameter)
- * auto formatter = new boost::unit_test::output::multi_log_formatter; // same as already configured logger
- *
- * // Prepare and add additional logger(s)
- * formatter.add(std::make_shared<boost::unit_test::output::xml_log_formatter>(),
- * std::make_shared<std::ofstream>("out.xml"));
- *
- * boost::unit_test::unit_test_log.set_formatter(formatter);
- *
- * @note Calling `boost::unit_test::unit_test_log.set_stream(...)` will change the stream for
- * the original logger.
- */
-class multi_log_formatter : public unit_test_log_formatter
-{
-public:
- /**
- * @brief Create instance of the logger, based on the configured logger instance
- */
- multi_log_formatter()
- {
- auto format =
-#if BOOST_VERSION > 105900
- runtime_config::get<output_format>(runtime_config::LOG_FORMAT);
-#else
- runtime_config::log_format();
-#endif // BOOST_VERSION > 105900
-
- switch (format) {
- default:
-#if BOOST_VERSION >= 105900
- case OF_CLF:
-#else
- case CLF:
-#endif // BOOST_VERSION >= 105900
- m_loggers.push_back({std::make_shared<compiler_log_formatter>(), nullptr});
- break;
-#if BOOST_VERSION >= 105900
- case OF_XML:
-#else
- case XML:
-#endif // BOOST_VERSION >= 105900
- m_loggers.push_back({std::make_shared<xml_log_formatter>(), nullptr});
- break;
- }
- }
-
- void
- add(std::shared_ptr<unit_test_log_formatter> formatter, std::shared_ptr<std::ostream> os)
- {
- m_loggers.push_back({formatter, os});
- }
-
- // Formatter interface
- void
- log_start(std::ostream& os, counter_t test_cases_amount)
- {
- for (auto& l : m_loggers)
- l.logger->log_start(l.os == nullptr ? os : *l.os, test_cases_amount);
- }
-
- void
- log_finish(std::ostream& os)
- {
- for (auto& l : m_loggers)
- l.logger->log_finish(l.os == nullptr ? os : *l.os);
- }
-
- void
- log_build_info(std::ostream& os)
- {
- for (auto& l : m_loggers)
- l.logger->log_build_info(l.os == nullptr ? os : *l.os);
- }
-
- void
- test_unit_start(std::ostream& os, const test_unit& tu)
- {
- for (auto& l : m_loggers)
- l.logger->test_unit_start(l.os == nullptr ? os : *l.os, tu);
- }
-
- void
- test_unit_finish(std::ostream& os, const test_unit& tu, unsigned long elapsed)
- {
- for (auto& l : m_loggers)
- l.logger->test_unit_finish(l.os == nullptr ? os : *l.os, tu, elapsed);
- }
-
- void
- test_unit_skipped(std::ostream& os, const test_unit& tu)
- {
- for (auto& l : m_loggers)
- l.logger->test_unit_skipped(l.os == nullptr ? os : *l.os, tu);
- }
-
-#if BOOST_VERSION >= 105900
- void
- log_exception_start(std::ostream& os, const log_checkpoint_data& lcd, const execution_exception& ex)
- {
- for (auto& l : m_loggers)
- l.logger->log_exception_start(l.os == nullptr ? os : *l.os, lcd, ex);
- }
-
- void
- log_exception_finish(std::ostream& os)
- {
- for (auto& l : m_loggers)
- l.logger->log_exception_finish(l.os == nullptr ? os : *l.os);
- }
-#else
- void
- log_exception(std::ostream& os, const log_checkpoint_data& lcd, const execution_exception& ex)
- {
- for (auto& l : m_loggers)
- l.logger->log_exception(l.os == nullptr ? os : *l.os, lcd, ex);
- }
-#endif // BOOST_VERSION >= 105900
-
- void
- log_entry_start(std::ostream& os, const log_entry_data& entry_data, log_entry_types let)
- {
- for (auto& l : m_loggers)
- l.logger->log_entry_start(l.os == nullptr ? os : *l.os, entry_data, let);
- }
-
- void
- log_entry_value(std::ostream& os, const_string value)
- {
- for (auto& l : m_loggers)
- l.logger->log_entry_value(l.os == nullptr ? os : *l.os, value);
- }
-
- void
- log_entry_finish(std::ostream& os)
- {
- for (auto& l : m_loggers)
- l.logger->log_entry_finish(l.os == nullptr ? os : *l.os);
- }
-
-#if BOOST_VERSION >= 105900
- void
- entry_context_start(std::ostream& os, log_level level)
- {
- for (auto& l : m_loggers)
- l.logger->entry_context_start(l.os == nullptr ? os : *l.os, level);
- }
-
- void
- log_entry_context(std::ostream& os, const_string value)
- {
- for (auto& l : m_loggers)
- l.logger->log_entry_context(l.os == nullptr ? os : *l.os, value);
- }
-
- void
- entry_context_finish(std::ostream& os)
- {
- for (auto& l : m_loggers)
- l.logger->entry_context_finish(l.os == nullptr ? os : *l.os);
- }
-#endif // BOOST_VERSION >= 105900
-
-private:
- struct LoggerInfo
- {
- std::shared_ptr<unit_test_log_formatter> logger;
- std::shared_ptr<std::ostream> os;
- };
- std::vector<LoggerInfo> m_loggers;
-};
-
-} // namespace output
-} // namespace unit_test
-} // namespace boost
-
-#endif // NDN_TESTS_UNIT_BOOST_MULTI_LOG_FORMATTER_HPP
diff --git a/tests/unit/main.cpp b/tests/unit/main.cpp
index cb54695..51edc79 100644
--- a/tests/unit/main.cpp
+++ b/tests/unit/main.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -20,91 +20,4 @@
*/
#define BOOST_TEST_MODULE ndn-cxx Unit Tests
-
-#include <boost/version.hpp>
-
-#if BOOST_VERSION >= 106200
-// Boost.Test v3.3 (Boost 1.62) natively supports multi-logger output
#include "tests/boost-test.hpp"
-#else
-#define BOOST_TEST_ALTERNATIVE_INIT_API
-#define BOOST_TEST_NO_MAIN
-#include "tests/boost-test.hpp"
-#include "tests/unit/boost-multi-log-formatter.hpp"
-
-#include <boost/program_options/options_description.hpp>
-#include <boost/program_options/variables_map.hpp>
-#include <boost/program_options/parsers.hpp>
-
-#include <fstream>
-#include <iostream>
-
-static bool
-init_tests()
-{
- init_unit_test();
-
- namespace po = boost::program_options;
- namespace ut = boost::unit_test;
-
- po::options_description extraOptions;
- std::string logger;
- std::string outputFile = "-";
- extraOptions.add_options()
- ("log_format2", po::value<std::string>(&logger), "Type of second log formatter: HRF or XML")
- ("log_sink2", po::value<std::string>(&outputFile)->default_value(outputFile), "Second log sink, - for stdout")
- ;
- po::variables_map vm;
- try {
- po::store(po::command_line_parser(ut::framework::master_test_suite().argc,
- ut::framework::master_test_suite().argv)
- .options(extraOptions)
- .run(),
- vm);
- po::notify(vm);
- }
- catch (const std::exception& e) {
- std::cerr << "ERROR: " << e.what() << "\n"
- << extraOptions << std::endl;
- return false;
- }
-
- if (vm.count("log_format2") == 0) {
- // second logger is not configured
- return true;
- }
-
- std::shared_ptr<ut::unit_test_log_formatter> formatter;
- if (logger == "XML") {
- formatter = std::make_shared<ut::output::xml_log_formatter>();
- }
- else if (logger == "HRF") {
- formatter = std::make_shared<ut::output::compiler_log_formatter>();
- }
- else {
- std::cerr << "ERROR: only HRF or XML log formatter can be specified" << std::endl;
- return false;
- }
-
- std::shared_ptr<std::ostream> output;
- if (outputFile == "-") {
- output = std::shared_ptr<std::ostream>(&std::cout, std::bind([]{}));
- }
- else {
- output = std::make_shared<std::ofstream>(outputFile.c_str());
- }
-
- auto multiFormatter = new ut::output::multi_log_formatter;
- multiFormatter->add(formatter, output);
- ut::unit_test_log.set_formatter(multiFormatter);
-
- return true;
-}
-
-int
-main(int argc, char* argv[])
-{
- return ::boost::unit_test::unit_test_main(&init_tests, argc, argv);
-}
-
-#endif // BOOST_VERSION >= 106200
diff --git a/tests/unit/util/placeholders2.t.cpp b/tests/unit/util/placeholders2.t.cpp
index d8b8c93..7b71406 100644
--- a/tests/unit/util/placeholders2.t.cpp
+++ b/tests/unit/util/placeholders2.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -21,13 +21,14 @@
// Bug 2109 test case
-// interest.hpp includes common.hpp; common.hpp shouldn't be used from external program
+// interest.hpp includes common.hpp; common.hpp is an implementation detail and should not
+// be directly included from an external program
#include "ndn-cxx/interest.hpp"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
void
-placeholders2TestFunction(int i)
+placeholders2TestFunction(int)
{
}
diff --git a/tools/ndnsec/export.cpp b/tools/ndnsec/export.cpp
index a11459d..6d3c260 100644
--- a/tools/ndnsec/export.cpp
+++ b/tools/ndnsec/export.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -38,6 +38,8 @@
std::string output;
std::string password;
+ // ASan reports a stack-use-after-scope on armhf when
+ // BOOST_SCOPE_EXIT_ALL is used in place of BOOST_SCOPE_EXIT
BOOST_SCOPE_EXIT(&password) {
OPENSSL_cleanse(&password.front(), password.size());
} BOOST_SCOPE_EXIT_END
diff --git a/tools/ndnsec/import.cpp b/tools/ndnsec/import.cpp
index f59ce93..c58a6ed 100644
--- a/tools/ndnsec/import.cpp
+++ b/tools/ndnsec/import.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2020 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -37,6 +37,8 @@
std::string input;
std::string password;
+ // ASan reports a stack-use-after-scope on armhf when
+ // BOOST_SCOPE_EXIT_ALL is used in place of BOOST_SCOPE_EXIT
BOOST_SCOPE_EXIT(&password) {
OPENSSL_cleanse(&password.front(), password.size());
} BOOST_SCOPE_EXIT_END
diff --git a/wscript b/wscript
index f8c818e..3765aa4 100644
--- a/wscript
+++ b/wscript
@@ -83,9 +83,9 @@
conf.find_program('sh', var='SH')
conf.check_cxx(lib='atomic', uselib_store='ATOMIC', define_name='HAVE_ATOMIC', mandatory=False)
-
conf.check_cxx(lib='pthread', uselib_store='PTHREAD', define_name='HAVE_PTHREAD', mandatory=False)
conf.check_cxx(lib='rt', uselib_store='RT', define_name='HAVE_RT', mandatory=False)
+
conf.check_cxx(msg='Checking for function getpass', define_name='HAVE_GETPASS', mandatory=False,
fragment='''#include <unistd.h>
int main() { getpass("Enter password"); }''')
@@ -127,9 +127,13 @@
conf.check_boost(lib=boost_libs, mt=True)
if conf.env.BOOST_VERSION_NUMBER < 105800:
- conf.fatal('Minimum required Boost version is 1.58.0\n'
- 'Please upgrade your distribution or manually install a newer version of Boost'
- ' (https://redmine.named-data.net/projects/nfd/wiki/Boost_FAQ)')
+ conf.fatal('The minimum supported version of Boost is 1.65.1.\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')
+ elif conf.env.BOOST_VERSION_NUMBER < 106501:
+ Logs.warn('WARNING: Using a version of Boost older than 1.65.1 is not officially supported and may not work.\n'
+ 'If you encounter any problems, 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')
# Workaround for bug 4860
if conf.env.BOOST_VERSION_NUMBER < 106900 and conf.env.CXX_NAME == 'clang':