From 42c0bc528a239f05fc68638b403bd9807d2db3e3 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Fri, 26 Jul 2024 18:12:21 +0200
Subject: [PATCH] refactor: use std::function in filesystem_(extractor|writer)

---
 include/dwarfs/filesystem_extractor.h | 5 ++---
 include/dwarfs/filesystem_writer.h    | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/dwarfs/filesystem_extractor.h b/include/dwarfs/filesystem_extractor.h
index a52c7588..06181ed0 100644
--- a/include/dwarfs/filesystem_extractor.h
+++ b/include/dwarfs/filesystem_extractor.h
@@ -22,13 +22,12 @@
 #pragma once
 
 #include <filesystem>
+#include <functional>
 #include <memory>
 #include <ostream>
 #include <string>
 #include <string_view>
 
-#include <folly/Function.h>
-
 namespace dwarfs {
 
 class filesystem_v2;
@@ -38,7 +37,7 @@ class os_access;
 struct filesystem_extractor_options {
   size_t max_queued_bytes{4096};
   bool continue_on_error{false};
-  folly::Function<void(std::string_view, uint64_t, uint64_t) const> progress;
+  std::function<void(std::string_view, uint64_t, uint64_t)> progress;
 };
 
 class filesystem_extractor {
diff --git a/include/dwarfs/filesystem_writer.h b/include/dwarfs/filesystem_writer.h
index 7a8c8e41..6987a372 100644
--- a/include/dwarfs/filesystem_writer.h
+++ b/include/dwarfs/filesystem_writer.h
@@ -23,14 +23,13 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <functional>
 #include <memory>
 #include <ostream>
 #include <span>
 #include <utility>
 #include <vector>
 
-#include <folly/Function.h>
-
 #include <dwarfs/compression_constraints.h>
 #include <dwarfs/fragment_category.h>
 #include <dwarfs/fs_section.h>
@@ -48,7 +47,7 @@ class worker_group;
 
 class filesystem_writer {
  public:
-  using physical_block_cb_type = folly::Function<void(size_t)>;
+  using physical_block_cb_type = std::function<void(size_t)>;
 
   filesystem_writer(
       std::ostream& os, logger& lgr, worker_group& wg, progress& prog,