diff --git a/CHANGES b/CHANGES index ceb2261d4e..58e4408a60 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +8.0.0-dev.790 | 2025-07-29 07:18:39 -0700 + + * Fix build failure with std::ranges on Debian 11 (Tim Wojtulewicz, Corelight) + 8.0.0-dev.788 | 2025-07-29 11:29:11 +0200 * cluster.bif: Improve Cluster::publish() docstring (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index 3026fe7f65..7c1e2af975 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.0-dev.788 +8.0.0-dev.790 diff --git a/src/util.cc b/src/util.cc index 8059976da6..02e17c74f8 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1538,7 +1538,14 @@ TEST_CASE("util strstrip") { std::string strstrip(std::string s) { auto notspace = [](unsigned char c) { return ! std::isspace(c); }; s.erase(s.begin(), std::ranges::find_if(s, notspace)); - s.erase(std::ranges::find_if(std::ranges::reverse_view(s), notspace).base(), s.end()); + + // We require `std::reverse_iterator::base` here which in e.g., gcc-10.2.1 + // is not implemented for the range equivalent of the code + // (`borrowed_iterator_t` over a `reverse_view`). Stick to the non-ranges + // version for now. + // NOLINTNEXTLINE(modernize-use-ranges) + s.erase(std::find_if(s.rbegin(), s.rend(), notspace).base(), s.end()); + return s; }