From 6a23580a232bcd78da0c8174d91a534cd26bd44e Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Thu, 14 May 2020 17:21:53 -0400 Subject: [PATCH 1/2] Use std::size in place of std::extent * Fixes RIPD-269 --- src/test/app/AccountTxPaging_test.cpp | 4 +--- src/test/core/SociDB_test.cpp | 4 ++-- src/test/rpc/AccountTx_test.cpp | 18 ++++++------------ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp index ec2c66809d1..0169c5609c3 100644 --- a/src/test/app/AccountTxPaging_test.cpp +++ b/src/test/app/AccountTxPaging_test.cpp @@ -1871,9 +1871,7 @@ class AccountTxPaging_test : public beast::unit_test::suite if (!BEAST_EXPECT(status.error_code() == 0)) return; - if (!BEAST_EXPECT( - res.transactions().size() == - std::extent::value)) + if (!BEAST_EXPECT(res.transactions().size() == std::size(txCheck))) return; for (int i = 0; i < res.transactions().size(); ++i) { diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp index 68cbd2a83bb..b80e6bca2d1 100644 --- a/src/test/core/SociDB_test.cpp +++ b/src/test/core/SociDB_test.cpp @@ -321,8 +321,8 @@ class SociDB_test final : public TestSuite LedgerSeq BIGINT UNSIGNED \ );", "CREATE INDEX SeqLedger ON Ledgers(LedgerSeq);"}; - int dbInitCount = std::extent::value; - for (int i = 0; i < dbInitCount; ++i) + auto dbInitCount = std::size(dbInit); + for (auto i = 0u; i < dbInitCount; ++i) { s << dbInit[i]; } diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp index 030fce99e10..534dd8235f8 100644 --- a/src/test/rpc/AccountTx_test.cpp +++ b/src/test/rpc/AccountTx_test.cpp @@ -445,12 +445,9 @@ class AccountTx_test : public beast::unit_test::suite // clang-format on BEAST_EXPECT( - std::extent::value == - result[jss::result][jss::transactions].size()); + std::size(sanity) == result[jss::result][jss::transactions].size()); - for (unsigned int index{0}; - index < std::extent::value; - ++index) + for (unsigned int index{0}; index < std::size(sanity); ++index) { checkSanity(txs[index], sanity[index]); } @@ -531,14 +528,14 @@ class AccountTx_test : public beast::unit_test::suite // The first two transactions listed in sanity haven't happened yet. constexpr unsigned int beckyDeletedOffest = 2; BEAST_EXPECT( - std::extent::value == + std::size(sanity) == result[jss::result][jss::transactions].size() + beckyDeletedOffest); Json::Value const& txs{result[jss::result][jss::transactions]}; for (unsigned int index = beckyDeletedOffest; - index < std::extent::value; + index < std::size(sanity); ++index) { checkSanity(txs[index - beckyDeletedOffest], sanity[index]); @@ -576,14 +573,11 @@ class AccountTx_test : public beast::unit_test::suite BEAST_EXPECT(result[jss::result][jss::transactions].isArray()); BEAST_EXPECT( - std::extent::value == - result[jss::result][jss::transactions].size()); + std::size(sanity) == result[jss::result][jss::transactions].size()); Json::Value const& txs{result[jss::result][jss::transactions]}; - for (unsigned int index = 0; - index < std::extent::value; - ++index) + for (unsigned int index = 0; index < std::size(sanity); ++index) { checkSanity(txs[index], sanity[index]); } From 058b8e822f851a55fcaf86e2762701512264b8db Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Wed, 27 May 2020 22:09:37 -0400 Subject: [PATCH 2/2] [FOLD] Use for-range loop --- src/test/core/SociDB_test.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp index b80e6bca2d1..42c939ed07b 100644 --- a/src/test/core/SociDB_test.cpp +++ b/src/test/core/SociDB_test.cpp @@ -321,11 +321,8 @@ class SociDB_test final : public TestSuite LedgerSeq BIGINT UNSIGNED \ );", "CREATE INDEX SeqLedger ON Ledgers(LedgerSeq);"}; - auto dbInitCount = std::size(dbInit); - for (auto i = 0u; i < dbInitCount; ++i) - { - s << dbInit[i]; - } + for (auto const c : dbInit) + s << c; char lh[65]; memset(lh, 'a', 64); lh[64] = '\0';