From 0cf59df6033825a6ddd8e7b270ceaa543dd20dd0 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sat, 15 Mar 2025 23:57:45 +0100
Subject: [PATCH] fix: don't forward repeatedly

---
 include/dwarfs/writer/contextual_option.h | 4 ++--
 src/writer/internal/inode_manager.cpp     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/dwarfs/writer/contextual_option.h b/include/dwarfs/writer/contextual_option.h
index 4969d284..e061a5c2 100644
--- a/include/dwarfs/writer/contextual_option.h
+++ b/include/dwarfs/writer/contextual_option.h
@@ -92,7 +92,7 @@ class contextual_option {
   template <typename T>
   bool any_is(T&& pred) const {
     for (auto e : contextual_) {
-      if (std::forward<T>(pred)(e.second)) {
+      if (pred(e.second)) {
         return true;
       }
     }
@@ -102,7 +102,7 @@ class contextual_option {
   template <typename T>
   void visit_contextual(T&& visitor) const {
     for (auto const& [ctx, val] : contextual_) {
-      std::forward<T>(visitor)(ctx, val);
+      visitor(ctx, val);
     }
   }
 
diff --git a/src/writer/internal/inode_manager.cpp b/src/writer/internal/inode_manager.cpp
index 21ed41ad..d8069804 100644
--- a/src/writer/internal/inode_manager.cpp
+++ b/src/writer/internal/inode_manager.cpp
@@ -384,7 +384,7 @@ class inode_ : public inode {
   void scan_range(mmif* mm, scanner_progress* sprog, size_t offset, size_t size,
                   size_t chunk_size, T&& scanner) {
     while (size >= chunk_size) {
-      std::forward<T>(scanner)(mm->span(offset, chunk_size));
+      scanner(mm->span(offset, chunk_size));
       // release_until() is best-effort, we can ignore the return value
       // NOLINTNEXTLINE(bugprone-unused-return-value)
       mm->release_until(offset);