Use more C++17 features
Mainly structured bindings, inline variables, and class template
argument deduction, plus many more smaller things.
Change-Id: I810d17e0adb470426e4e30c898e03b3140ad052f
diff --git a/tests/daemon/table/cs.t.cpp b/tests/daemon/table/cs.t.cpp
index 85886da..b8e34de 100644
--- a/tests/daemon/table/cs.t.cpp
+++ b/tests/daemon/table/cs.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -264,12 +264,12 @@
insert(12, nameAB);
insert(4, nameD);
- std::set<Name> expected = {nameA, nameAB, nameABC, nameD};
+ const std::set<Name> expected{nameA, nameAB, nameABC, nameD};
std::set<Name> actual;
for (const auto& csEntry : cs) {
actual.insert(csEntry.getName());
}
- BOOST_CHECK_EQUAL_COLLECTIONS(actual.begin(), actual.end(), expected.begin(), expected.end());
+ BOOST_TEST(actual == expected, boost::test_tools::per_element());
}
BOOST_AUTO_TEST_SUITE_END() // TestCs