From 3b5c31802e770eb16b24fe3a09c0502256855fcd Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:49:00 -0400 Subject: [PATCH] fix build with clang19 --- libraries/libfc/include/fc/io/datastream.hpp | 4 ++-- tests/ship_log.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/libfc/include/fc/io/datastream.hpp b/libraries/libfc/include/fc/io/datastream.hpp index b17279481a..47a9fbf70a 100644 --- a/libraries/libfc/include/fc/io/datastream.hpp +++ b/libraries/libfc/include/fc/io/datastream.hpp @@ -110,8 +110,8 @@ class datastreampubseekoff(0, std::ios::cur); } - bool skip(size_t p) { this->pubseekoff(p, std::ios::cur); return true; } + size_t tellp() { return buf.pubseekoff(0, std::ios::cur); } + bool skip(size_t p) { buf.pubseekoff(p, std::ios::cur); return true; } bool get(char& c) { c = buf.sbumpc(); return true; diff --git a/tests/ship_log.cpp b/tests/ship_log.cpp index 5835af5023..55edebced7 100644 --- a/tests/ship_log.cpp +++ b/tests/ship_log.cpp @@ -375,7 +375,7 @@ BOOST_DATA_TEST_CASE(non_prune_to_prune, bdata::xrange(2) * bdata::xrange(2), en //upgrade to pruned... t.conf = eosio::state_history::prune_config{ .prune_blocks = 4 }; - t.template check_n_bounce([]() {}); + t.check_n_bounce([]() {}); t.check_n_bounce([&]() { t.check_range_present(6, 9); @@ -410,7 +410,7 @@ BOOST_DATA_TEST_CASE(prune_to_non_prune, bdata::xrange(2) * bdata::xrange(2), en //no more pruned t.conf = std::monostate{}; - t.template check_n_bounce([]() {}); + t.check_n_bounce([]() {}); t.check_n_bounce([&]() { t.check_range_present(6, 9); @@ -450,7 +450,7 @@ BOOST_DATA_TEST_CASE(prune_to_partitioned, bdata::xrange(2) * bdata::xrange(2), .stride = 5 }; - t.template check_n_bounce([]() {}); + t.check_n_bounce([]() {}); t.check_n_bounce([&]() { t.check_range_present(6, 9);