Module Name: src
Committed By: christos
Date: Mon Mar 9 20:34:52 UTC 2020
Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/dist/atf-c++: check.cpp check.hpp check_test.cpp
tests.hpp
src/external/bsd/atf/dist/atf-c++/detail: process_test.cpp
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
src/external/bsd/atf/dist/tools: atf-report.cpp atffile_test.cpp fs.hpp
io.hpp parser.hpp process_test.cpp timers.hpp
Log Message:
remove -std=gnu++98
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/atf/dist/atf-c++/check.cpp
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/atf/dist/atf-c++/check.hpp
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/atf/dist/atf-c++/check_test.cpp
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/dist/atf-c++/tests.hpp
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-report.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/atffile_test.cpp \
src/external/bsd/atf/dist/tools/fs.hpp \
src/external/bsd/atf/dist/tools/io.hpp \
src/external/bsd/atf/dist/tools/parser.hpp \
src/external/bsd/atf/dist/tools/process_test.cpp \
src/external/bsd/atf/dist/tools/timers.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.6 src/external/bsd/atf/Makefile.inc:1.7
--- src/external/bsd/atf/Makefile.inc:1.6 Sat Feb 3 20:41:05 2018
+++ src/external/bsd/atf/Makefile.inc Mon Mar 9 16:34:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2018/02/04 01:41:05 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2020/03/09 20:34:52 christos Exp $
.include <bsd.own.mk>
@@ -41,8 +41,6 @@ CPPFLAGS+= -I${TOPDIR} # For bconfig.h
CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For atf-c/defs.hpp.
CPPFLAGS+= -I${SRCDIR}
-CXXFLAGS+= -std=gnu++98
-
.if defined(USE_ATF_LIBTOOLS)
LIBTOOLSOBJDIR!= cd ${TOPDIR}/lib/tools; ${PRINTOBJDIR}
CPPFLAGS+= -I${LIBTOOLSOBJDIR}
Index: src/external/bsd/atf/dist/atf-c++/check.cpp
diff -u src/external/bsd/atf/dist/atf-c++/check.cpp:1.1.1.6 src/external/bsd/atf/dist/atf-c++/check.cpp:1.2
--- src/external/bsd/atf/dist/atf-c++/check.cpp:1.1.1.6 Mon Jan 16 17:36:43 2012
+++ src/external/bsd/atf/dist/atf-c++/check.cpp Mon Mar 9 16:34:52 2020
@@ -145,7 +145,7 @@ impl::build_cxx_o(const std::string& sfi
return success;
}
-std::auto_ptr< impl::check_result >
+std::unique_ptr< impl::check_result >
impl::exec(const atf::process::argv_array& argva)
{
atf_check_result_t result;
@@ -154,5 +154,5 @@ impl::exec(const atf::process::argv_arra
if (atf_is_error(err))
throw_atf_error(err);
- return std::auto_ptr< impl::check_result >(new impl::check_result(&result));
+ return std::unique_ptr< impl::check_result >(new impl::check_result(&result));
}
Index: src/external/bsd/atf/dist/atf-c++/check.hpp
diff -u src/external/bsd/atf/dist/atf-c++/check.hpp:1.1.1.8 src/external/bsd/atf/dist/atf-c++/check.hpp:1.2
--- src/external/bsd/atf/dist/atf-c++/check.hpp:1.1.1.8 Sat Feb 8 14:11:31 2014
+++ src/external/bsd/atf/dist/atf-c++/check.hpp Mon Mar 9 16:34:52 2020
@@ -75,7 +75,7 @@ class check_result {
check_result(const atf_check_result_t* result);
friend check_result test_constructor(const char* const*);
- friend std::auto_ptr< check_result > exec(const atf::process::argv_array&);
+ friend std::unique_ptr< check_result > exec(const atf::process::argv_array&);
public:
//!
@@ -124,7 +124,7 @@ bool build_cpp(const std::string&, const
const atf::process::argv_array&);
bool build_cxx_o(const std::string&, const std::string&,
const atf::process::argv_array&);
-std::auto_ptr< check_result > exec(const atf::process::argv_array&);
+std::unique_ptr< check_result > exec(const atf::process::argv_array&);
// Useful for testing only.
check_result test_constructor(void);
Index: src/external/bsd/atf/dist/atf-c++/check_test.cpp
diff -u src/external/bsd/atf/dist/atf-c++/check_test.cpp:1.1.1.7 src/external/bsd/atf/dist/atf-c++/check_test.cpp:1.2
--- src/external/bsd/atf/dist/atf-c++/check_test.cpp:1.1.1.7 Sat Feb 8 14:11:31 2014
+++ src/external/bsd/atf/dist/atf-c++/check_test.cpp Mon Mar 9 16:34:52 2020
@@ -57,7 +57,7 @@ extern "C" {
// ------------------------------------------------------------------------
static
-std::auto_ptr< atf::check::check_result >
+std::unique_ptr< atf::check::check_result >
do_exec(const atf::tests::tc* tc, const char* helper_name)
{
std::vector< std::string > argv;
@@ -70,7 +70,7 @@ do_exec(const atf::tests::tc* tc, const
}
static
-std::auto_ptr< atf::check::check_result >
+std::unique_ptr< atf::check::check_result >
do_exec(const atf::tests::tc* tc, const char* helper_name, const char *carg2)
{
std::vector< std::string > argv;
@@ -253,11 +253,11 @@ ATF_TEST_CASE_HEAD(exec_cleanup)
}
ATF_TEST_CASE_BODY(exec_cleanup)
{
- std::auto_ptr< atf::fs::path > out;
- std::auto_ptr< atf::fs::path > err;
+ std::unique_ptr< atf::fs::path > out;
+ std::unique_ptr< atf::fs::path > err;
{
- std::auto_ptr< atf::check::check_result > r =
+ std::unique_ptr< atf::check::check_result > r =
do_exec(this, "exit-success");
out.reset(new atf::fs::path(r->stdout_path()));
err.reset(new atf::fs::path(r->stderr_path()));
@@ -277,7 +277,7 @@ ATF_TEST_CASE_HEAD(exec_exitstatus)
ATF_TEST_CASE_BODY(exec_exitstatus)
{
{
- std::auto_ptr< atf::check::check_result > r =
+ std::unique_ptr< atf::check::check_result > r =
do_exec(this, "exit-success");
ATF_REQUIRE(r->exited());
ATF_REQUIRE(!r->signaled());
@@ -285,7 +285,7 @@ ATF_TEST_CASE_BODY(exec_exitstatus)
}
{
- std::auto_ptr< atf::check::check_result > r =
+ std::unique_ptr< atf::check::check_result > r =
do_exec(this, "exit-failure");
ATF_REQUIRE(r->exited());
ATF_REQUIRE(!r->signaled());
@@ -293,7 +293,7 @@ ATF_TEST_CASE_BODY(exec_exitstatus)
}
{
- std::auto_ptr< atf::check::check_result > r =
+ std::unique_ptr< atf::check::check_result > r =
do_exec(this, "exit-signal");
ATF_REQUIRE(!r->exited());
ATF_REQUIRE(r->signaled());
@@ -326,12 +326,12 @@ ATF_TEST_CASE_HEAD(exec_stdout_stderr)
}
ATF_TEST_CASE_BODY(exec_stdout_stderr)
{
- std::auto_ptr< atf::check::check_result > r1 =
+ std::unique_ptr< atf::check::check_result > r1 =
do_exec(this, "stdout-stderr", "result1");
ATF_REQUIRE(r1->exited());
ATF_REQUIRE_EQ(r1->exitcode(), EXIT_SUCCESS);
- std::auto_ptr< atf::check::check_result > r2 =
+ std::unique_ptr< atf::check::check_result > r2 =
do_exec(this, "stdout-stderr", "result2");
ATF_REQUIRE(r2->exited());
ATF_REQUIRE_EQ(r2->exitcode(), EXIT_SUCCESS);
@@ -377,7 +377,7 @@ ATF_TEST_CASE_BODY(exec_unknown)
argv.push_back(atf::config::get("atf_workdir") + "/non-existent");
atf::process::argv_array argva(argv);
- std::auto_ptr< atf::check::check_result > r = atf::check::exec(argva);
+ std::unique_ptr< atf::check::check_result > r = atf::check::exec(argva);
ATF_REQUIRE(r->exited());
ATF_REQUIRE_EQ(r->exitcode(), 127);
}
Index: src/external/bsd/atf/dist/atf-c++/tests.hpp
diff -u src/external/bsd/atf/dist/atf-c++/tests.hpp:1.8 src/external/bsd/atf/dist/atf-c++/tests.hpp:1.9
--- src/external/bsd/atf/dist/atf-c++/tests.hpp:1.8 Sat Feb 8 14:13:43 2014
+++ src/external/bsd/atf/dist/atf-c++/tests.hpp Mon Mar 9 16:34:52 2020
@@ -77,7 +77,7 @@ class tc {
tc(const tc&);
tc& operator=(const tc&);
- std::auto_ptr< tc_impl > pimpl;
+ std::unique_ptr< tc_impl > pimpl;
protected:
virtual void head(void);
Index: src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp
diff -u src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp:1.1.1.3 src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp:1.2
--- src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp:1.1.1.3 Sat Feb 8 14:11:32 2014
+++ src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp Mon Mar 9 16:34:52 2020
@@ -199,8 +199,8 @@ ATF_TEST_CASE_BODY(argv_array_assign)
const char* const carray1[] = { "arg1", NULL };
const char* const carray2[] = { "arg1", "arg2", NULL };
- std::auto_ptr< argv_array > argv1(new argv_array(carray1));
- std::auto_ptr< argv_array > argv2(new argv_array(carray2));
+ std::unique_ptr< argv_array > argv1(new argv_array(carray1));
+ std::unique_ptr< argv_array > argv2(new argv_array(carray2));
*argv2 = *argv1;
ATF_REQUIRE_EQ(argv2->size(), argv1->size());
@@ -229,8 +229,8 @@ ATF_TEST_CASE_BODY(argv_array_copy)
const char* const carray[] = { "arg0", NULL };
- std::auto_ptr< argv_array > argv1(new argv_array(carray));
- std::auto_ptr< argv_array > argv2(new argv_array(*argv1));
+ std::unique_ptr< argv_array > argv1(new argv_array(carray));
+ std::unique_ptr< argv_array > argv2(new argv_array(*argv1));
ATF_REQUIRE_EQ(argv2->size(), argv1->size());
ATF_REQUIRE(std::strcmp((*argv2)[0], (*argv1)[0]) == 0);
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.12 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.13
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.12 Tue Oct 8 21:18:55 2019
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Mon Mar 9 16:34:52 2020
@@ -108,7 +108,7 @@ struct output_check {
};
class temp_file : public std::ostream {
- std::auto_ptr< atf::fs::path > m_path;
+ std::unique_ptr< atf::fs::path > m_path;
int m_fd;
public:
@@ -328,7 +328,7 @@ flatten_argv(char* const* argv)
}
static
-std::auto_ptr< atf::check::check_result >
+std::unique_ptr< atf::check::check_result >
execute(const char* const* argv)
{
// TODO: This should go to stderr... but fixing it now may be hard as test
@@ -344,7 +344,7 @@ execute(const char* const* argv)
}
static
-std::auto_ptr< atf::check::check_result >
+std::unique_ptr< atf::check::check_result >
execute_with_shell(char* const* argv)
{
const std::string cmd = flatten_argv(argv);
@@ -815,7 +815,7 @@ atf_check::main(void)
int status = EXIT_FAILURE;
- std::auto_ptr< atf::check::check_result > r =
+ std::unique_ptr< atf::check::check_result > r =
m_xflag ? execute_with_shell(m_argv) : execute(m_argv);
if (m_status_checks.empty())
Index: src/external/bsd/atf/dist/tools/atf-report.cpp
diff -u src/external/bsd/atf/dist/tools/atf-report.cpp:1.4 src/external/bsd/atf/dist/tools/atf-report.cpp:1.5
--- src/external/bsd/atf/dist/tools/atf-report.cpp:1.4 Tue Feb 11 11:31:38 2014
+++ src/external/bsd/atf/dist/tools/atf-report.cpp Mon Mar 9 16:34:52 2020
@@ -47,7 +47,7 @@ extern "C" {
#include "text.hpp"
#include "ui.hpp"
-typedef std::auto_ptr< std::ostream > ostream_ptr;
+typedef std::unique_ptr< std::ostream > ostream_ptr;
static ostream_ptr
open_outfile(const tools::fs::path& path)
Index: src/external/bsd/atf/dist/tools/atffile_test.cpp
diff -u src/external/bsd/atf/dist/tools/atffile_test.cpp:1.1.1.1 src/external/bsd/atf/dist/tools/atffile_test.cpp:1.2
--- src/external/bsd/atf/dist/tools/atffile_test.cpp:1.1.1.1 Sat Feb 8 14:11:33 2014
+++ src/external/bsd/atf/dist/tools/atffile_test.cpp Mon Mar 9 16:34:52 2020
@@ -53,10 +53,10 @@ namespace {
typedef std::map< std::string, std::string > vars_map;
static
-std::auto_ptr< std::ofstream >
+std::unique_ptr< std::ofstream >
new_atffile(void)
{
- std::auto_ptr< std::ofstream > os(new std::ofstream("Atffile"));
+ std::unique_ptr< std::ofstream > os(new std::ofstream("Atffile"));
ATF_REQUIRE(*os);
(*os) << "Content-Type: application/X-atf-atffile; version=\"1\"\n\n";
@@ -519,7 +519,7 @@ ATF_TEST_CASE_BODY(atffile_getters) {
ATF_TEST_CASE_WITHOUT_HEAD(read_ok_simple);
ATF_TEST_CASE_BODY(read_ok_simple) {
- std::auto_ptr< std::ofstream > os = new_atffile();
+ std::unique_ptr< std::ofstream > os = new_atffile();
(*os) << "prop: test-suite = foo\n";
(*os) << "tp: tp-1\n";
(*os) << "conf: var1 = value1\n";
@@ -549,7 +549,7 @@ ATF_TEST_CASE_BODY(read_ok_simple) {
ATF_TEST_CASE_WITHOUT_HEAD(read_ok_some_globs);
ATF_TEST_CASE_BODY(read_ok_some_globs) {
- std::auto_ptr< std::ofstream > os = new_atffile();
+ std::unique_ptr< std::ofstream > os = new_atffile();
(*os) << "prop: test-suite = foo\n";
(*os) << "tp: foo\n";
(*os) << "tp-glob: *K*\n";
@@ -576,7 +576,7 @@ ATF_TEST_CASE_BODY(read_ok_some_globs) {
ATF_TEST_CASE_WITHOUT_HEAD(read_missing_test_suite);
ATF_TEST_CASE_BODY(read_missing_test_suite) {
- std::auto_ptr< std::ofstream > os = new_atffile();
+ std::unique_ptr< std::ofstream > os = new_atffile();
(*os).close();
try {
@@ -589,7 +589,7 @@ ATF_TEST_CASE_BODY(read_missing_test_sui
ATF_TEST_CASE_WITHOUT_HEAD(read_missing_test_program);
ATF_TEST_CASE_BODY(read_missing_test_program) {
- std::auto_ptr< std::ofstream > os = new_atffile();
+ std::unique_ptr< std::ofstream > os = new_atffile();
(*os) << "tp: foo\n";
(*os) << "tp: bar\n";
(*os) << "tp: baz\n";
Index: src/external/bsd/atf/dist/tools/fs.hpp
diff -u src/external/bsd/atf/dist/tools/fs.hpp:1.1.1.1 src/external/bsd/atf/dist/tools/fs.hpp:1.2
--- src/external/bsd/atf/dist/tools/fs.hpp:1.1.1.1 Sat Feb 8 14:11:33 2014
+++ src/external/bsd/atf/dist/tools/fs.hpp Mon Mar 9 16:34:52 2020
@@ -326,7 +326,7 @@ public:
// ------------------------------------------------------------------------
class temp_dir {
- std::auto_ptr< tools::fs::path > m_path;
+ std::unique_ptr< tools::fs::path > m_path;
public:
temp_dir(const tools::fs::path&);
Index: src/external/bsd/atf/dist/tools/io.hpp
diff -u src/external/bsd/atf/dist/tools/io.hpp:1.1.1.1 src/external/bsd/atf/dist/tools/io.hpp:1.2
--- src/external/bsd/atf/dist/tools/io.hpp:1.1.1.1 Sat Feb 8 14:11:33 2014
+++ src/external/bsd/atf/dist/tools/io.hpp Mon Mar 9 16:34:52 2020
@@ -55,7 +55,7 @@ namespace io {
//!
//! A \a file_handle object can be copied but doing so invalidates the
//! source object. There can only be a single valid \a file_handle object
-//! for a given system file handle. This is similar to std::auto_ptr\<\>'s
+//! for a given system file handle. This is similar to std::unique_ptr\<\>'s
//! semantics.
//!
//! This class also provides some convenience methods to issue special file
Index: src/external/bsd/atf/dist/tools/parser.hpp
diff -u src/external/bsd/atf/dist/tools/parser.hpp:1.1.1.1 src/external/bsd/atf/dist/tools/parser.hpp:1.2
--- src/external/bsd/atf/dist/tools/parser.hpp:1.1.1.1 Sat Feb 8 14:11:33 2014
+++ src/external/bsd/atf/dist/tools/parser.hpp Mon Mar 9 16:34:52 2020
@@ -324,7 +324,7 @@ class parser {
public:
parser(TKZ& tkz);
- ~parser(void);
+ ~parser(void) noexcept(false);
bool good(void) const;
void add_error(const parse_error&);
@@ -386,7 +386,7 @@ parser< TKZ >::parser(TKZ& tkz) :
}
template< class TKZ >
-parser< TKZ >::~parser(void)
+parser< TKZ >::~parser(void) noexcept(false)
{
if (!m_errors.empty() && !m_thrown)
throw m_errors;
Index: src/external/bsd/atf/dist/tools/process_test.cpp
diff -u src/external/bsd/atf/dist/tools/process_test.cpp:1.1.1.1 src/external/bsd/atf/dist/tools/process_test.cpp:1.2
--- src/external/bsd/atf/dist/tools/process_test.cpp:1.1.1.1 Sat Feb 8 14:11:33 2014
+++ src/external/bsd/atf/dist/tools/process_test.cpp Mon Mar 9 16:34:52 2020
@@ -202,8 +202,8 @@ ATF_TEST_CASE_BODY(argv_array_assign)
const char* const carray1[] = { "arg1", NULL };
const char* const carray2[] = { "arg1", "arg2", NULL };
- std::auto_ptr< argv_array > argv1(new argv_array(carray1));
- std::auto_ptr< argv_array > argv2(new argv_array(carray2));
+ std::unique_ptr< argv_array > argv1(new argv_array(carray1));
+ std::unique_ptr< argv_array > argv2(new argv_array(carray2));
*argv2 = *argv1;
ATF_REQUIRE_EQ(argv2->size(), argv1->size());
@@ -232,8 +232,8 @@ ATF_TEST_CASE_BODY(argv_array_copy)
const char* const carray[] = { "arg0", NULL };
- std::auto_ptr< argv_array > argv1(new argv_array(carray));
- std::auto_ptr< argv_array > argv2(new argv_array(*argv1));
+ std::unique_ptr< argv_array > argv1(new argv_array(carray));
+ std::unique_ptr< argv_array > argv2(new argv_array(*argv1));
ATF_REQUIRE_EQ(argv2->size(), argv1->size());
ATF_REQUIRE(std::strcmp((*argv2)[0], (*argv1)[0]) == 0);
Index: src/external/bsd/atf/dist/tools/timers.hpp
diff -u src/external/bsd/atf/dist/tools/timers.hpp:1.1.1.1 src/external/bsd/atf/dist/tools/timers.hpp:1.2
--- src/external/bsd/atf/dist/tools/timers.hpp:1.1.1.1 Sat Feb 8 14:11:33 2014
+++ src/external/bsd/atf/dist/tools/timers.hpp Mon Mar 9 16:34:52 2020
@@ -51,7 +51,7 @@ class timer {
timer& operator=(const timer&);
struct impl;
- std::auto_ptr< impl > m_pimpl;
+ std::unique_ptr< impl > m_pimpl;
public:
timer(const unsigned int);
