diff --git a/include/dwarfs/error.h b/include/dwarfs/error.h index c34272d6..613c496a 100644 --- a/include/dwarfs/error.h +++ b/include/dwarfs/error.h @@ -24,9 +24,7 @@ #include #include #include - -#include -#include +#include namespace dwarfs { @@ -56,7 +54,7 @@ class runtime_error : public error { : error(s, file, line) {} }; -class system_error : public boost::system::system_error { +class system_error : public std::system_error { public: system_error(char const* file, int line) noexcept; system_error(std::string const& s, char const* file, int line) noexcept; diff --git a/include/dwarfs/mmap.h b/include/dwarfs/mmap.h index 89566551..f5a7e429 100644 --- a/include/dwarfs/mmap.h +++ b/include/dwarfs/mmap.h @@ -38,9 +38,9 @@ class mmap : public mmif { void const* addr() const override; size_t size() const override; - boost::system::error_code lock(off_t offset, size_t size) override; - boost::system::error_code release(off_t offset, size_t size) override; - boost::system::error_code release_until(off_t offset) override; + std::error_code lock(off_t offset, size_t size) override; + std::error_code release(off_t offset, size_t size) override; + std::error_code release_until(off_t offset) override; private: int fd_; diff --git a/include/dwarfs/mmif.h b/include/dwarfs/mmif.h index 51128629..fb243ba7 100644 --- a/include/dwarfs/mmif.h +++ b/include/dwarfs/mmif.h @@ -22,9 +22,9 @@ #pragma once #include +#include #include -#include #include @@ -47,8 +47,8 @@ class mmif : public boost::noncopyable { virtual void const* addr() const = 0; virtual size_t size() const = 0; - virtual boost::system::error_code lock(off_t offset, size_t size) = 0; - virtual boost::system::error_code release(off_t offset, size_t size) = 0; - virtual boost::system::error_code release_until(off_t offset) = 0; + virtual std::error_code lock(off_t offset, size_t size) = 0; + virtual std::error_code release(off_t offset, size_t size) = 0; + virtual std::error_code release_until(off_t offset) = 0; }; } // namespace dwarfs diff --git a/src/dwarfs/error.cpp b/src/dwarfs/error.cpp index 26769cc4..d0109743 100644 --- a/src/dwarfs/error.cpp +++ b/src/dwarfs/error.cpp @@ -43,13 +43,12 @@ system_error::system_error(std::string const& s, char const* file, system_error::system_error(std::string const& s, int err, char const* file, int line) noexcept - : boost::system::system_error(err, boost::system::generic_category(), - s.c_str()) + : std::system_error(err, std::generic_category(), s.c_str()) , file_(file) , line_(line) {} system_error::system_error(int err, char const* file, int line) noexcept - : boost::system::system_error(err, boost::system::generic_category()) + : std::system_error(err, std::generic_category()) , file_(file) , line_(line) {} diff --git a/src/dwarfs/filesystem_v2.cpp b/src/dwarfs/filesystem_v2.cpp index d3e20831..6c80de20 100644 --- a/src/dwarfs/filesystem_v2.cpp +++ b/src/dwarfs/filesystem_v2.cpp @@ -28,8 +28,6 @@ #include #include -#include - #include #include diff --git a/src/dwarfs/mmap.cpp b/src/dwarfs/mmap.cpp index 60d1035f..b1763ce0 100644 --- a/src/dwarfs/mmap.cpp +++ b/src/dwarfs/mmap.cpp @@ -26,8 +26,6 @@ #include #include -#include - #include #include "dwarfs/error.h" @@ -71,17 +69,17 @@ void* safe_mmap(int fd, size_t size) { } // namespace -boost::system::error_code mmap::lock(off_t offset, size_t size) { - boost::system::error_code ec; +std::error_code mmap::lock(off_t offset, size_t size) { + std::error_code ec; auto addr = reinterpret_cast(addr_) + offset; if (::mlock(addr, size) != 0) { - ec.assign(errno, boost::system::generic_category()); + ec.assign(errno, std::generic_category()); } return ec; } -boost::system::error_code mmap::release(off_t offset, size_t size) { - boost::system::error_code ec; +std::error_code mmap::release(off_t offset, size_t size) { + std::error_code ec; auto misalign = offset % page_size_; offset -= misalign; @@ -90,18 +88,18 @@ boost::system::error_code mmap::release(off_t offset, size_t size) { auto addr = reinterpret_cast(addr_) + offset; if (::madvise(addr, size, MADV_DONTNEED) != 0) { - ec.assign(errno, boost::system::generic_category()); + ec.assign(errno, std::generic_category()); } return ec; } -boost::system::error_code mmap::release_until(off_t offset) { - boost::system::error_code ec; +std::error_code mmap::release_until(off_t offset) { + std::error_code ec; offset -= offset % page_size_; if (::madvise(addr_, offset, MADV_DONTNEED) != 0) { - ec.assign(errno, boost::system::generic_category()); + ec.assign(errno, std::generic_category()); } return ec; } diff --git a/src/dwarfs/scanner.cpp b/src/dwarfs/scanner.cpp index 49df0065..fa6a8de4 100644 --- a/src/dwarfs/scanner.cpp +++ b/src/dwarfs/scanner.cpp @@ -30,13 +30,12 @@ #include #include #include +#include #include #include #include -#include - #include #include @@ -575,7 +574,7 @@ scanner_::scan_tree(const std::string& path, progress& prog, break; } } - } catch (const boost::system::system_error& e) { + } catch (const std::system_error& e) { LOG_ERROR << "error reading entry: " << e.what(); prog.errors++; } @@ -584,7 +583,7 @@ scanner_::scan_tree(const std::string& path, progress& prog, queue.insert(queue.begin(), subdirs.begin(), subdirs.end()); prog.dirs_scanned++; - } catch (const boost::system::system_error& e) { + } catch (const std::system_error& e) { LOG_ERROR << "cannot open directory: " << e.what(); prog.errors++; } diff --git a/test/mmap_mock.h b/test/mmap_mock.h index fe3a45a8..f462a3a9 100644 --- a/test/mmap_mock.h +++ b/test/mmap_mock.h @@ -33,15 +33,9 @@ class mmap_mock : public mmif { size_t size() const override { return m_data.size(); } - boost::system::error_code lock(off_t, size_t) override { - return boost::system::error_code(); - } - boost::system::error_code release(off_t, size_t) override { - return boost::system::error_code(); - } - boost::system::error_code release_until(off_t) override { - return boost::system::error_code(); - } + std::error_code lock(off_t, size_t) override { return std::error_code(); } + std::error_code release(off_t, size_t) override { return std::error_code(); } + std::error_code release_until(off_t) override { return std::error_code(); } private: const std::string m_data;