From ef6a52a40709a7e6929ea01efa2b87f1b57df27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Tue, 11 Aug 2020 11:44:01 -0700 Subject: [PATCH] test: Drop ifdef now that we always use c++20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafael Ávila de Espíndola --- .../lib/sstable_run_based_compaction_strategy_for_tests.hh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/lib/sstable_run_based_compaction_strategy_for_tests.hh b/test/lib/sstable_run_based_compaction_strategy_for_tests.hh index 9d1234d11e..d584dcc3e6 100644 --- a/test/lib/sstable_run_based_compaction_strategy_for_tests.hh +++ b/test/lib/sstable_run_based_compaction_strategy_for_tests.hh @@ -61,12 +61,7 @@ public: if (runs.size() < size_t(cf.schema()->min_compaction_threshold())) { continue; } -#if __cplusplus <= 201703L - using vector_shared_sstable_ref = std::vector&; -#else - using vector_shared_sstable_ref = std::vector&&; -#endif - auto all = boost::accumulate(runs, std::vector(), [&] (vector_shared_sstable_ref v, const sstable_run& run) { + auto all = boost::accumulate(runs, std::vector(), [&] (std::vector&& v, const sstable_run& run) { v.insert(v.end(), run.all().begin(), run.all().end()); return std::move(v); });