From aea9a0bda5ffc7aac4ba5e8c6582893b7aad7d90 Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Wed, 25 Sep 2019 16:31:49 +0100 Subject: LLFIO is now make installable and cmake find_package()-able, which should implement cmake hunter support. Significantly slimmed down the headers being dragged in by the default LLFIO include, specifically that outcome is no longer dragged in, and: - #36 Async file i/o and storage profile have been modularised out of the default headers. - #36 Mapped file i/o can be modularised out of the default headers. Changed barrier kind to class enum, as per latest WG21 spec. --- .../llfio/v2.0/algorithm/shared_fs_mutex/base.hpp | 12 +----------- .../v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp | 12 +----------- .../v2.0/algorithm/shared_fs_mutex/lock_files.hpp | 12 +----------- .../v2.0/algorithm/shared_fs_mutex/memory_map.hpp | 22 +++------------------- 4 files changed, 6 insertions(+), 52 deletions(-) (limited to 'include/llfio/v2.0/algorithm') diff --git a/include/llfio/v2.0/algorithm/shared_fs_mutex/base.hpp b/include/llfio/v2.0/algorithm/shared_fs_mutex/base.hpp index c3e881b8..8e339d13 100644 --- a/include/llfio/v2.0/algorithm/shared_fs_mutex/base.hpp +++ b/include/llfio/v2.0/algorithm/shared_fs_mutex/base.hpp @@ -27,17 +27,7 @@ Distributed under the Boost Software License, Version 1.0. #include "../../handle.hpp" -#ifdef __has_include -#if __has_include("../../quickcpplib/include/algorithm/hash.hpp") -#include "../../quickcpplib/include/algorithm/hash.hpp" -#else -#include "quickcpplib/include/algorithm/hash.hpp" -#endif -#elif __PCPP_ALWAYS_TRUE__ -#include "quickcpplib/include/algorithm/hash.hpp" -#else -#include "../../quickcpplib/include/algorithm/hash.hpp" -#endif +#include "quickcpplib/algorithm/hash.hpp" //! \file base.hpp Provides algorithm::shared_fs_mutex::shared_fs_mutex diff --git a/include/llfio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp b/include/llfio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp index dfc99e9c..cb42ce05 100644 --- a/include/llfio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp +++ b/include/llfio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp @@ -28,17 +28,7 @@ Distributed under the Boost Software License, Version 1.0. #include "../../file_handle.hpp" #include "base.hpp" -#ifdef __has_include -#if __has_include("../../quickcpplib/include/algorithm/small_prng.hpp") -#include "../../quickcpplib/include/algorithm/small_prng.hpp" -#else -#include "quickcpplib/include/algorithm/small_prng.hpp" -#endif -#elif __PCPP_ALWAYS_TRUE__ -#include "quickcpplib/include/algorithm/small_prng.hpp" -#else -#include "../../quickcpplib/include/algorithm/small_prng.hpp" -#endif +#include "quickcpplib/algorithm/small_prng.hpp" //! \file byte_ranges.hpp Provides algorithm::shared_fs_mutex::byte_ranges diff --git a/include/llfio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp b/include/llfio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp index 6534767b..62042cd2 100644 --- a/include/llfio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp +++ b/include/llfio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp @@ -28,17 +28,7 @@ Distributed under the Boost Software License, Version 1.0. #include "../../file_handle.hpp" #include "base.hpp" -#ifdef __has_include -#if __has_include("../../quickcpplib/include/algorithm/small_prng.hpp") -#include "../../quickcpplib/include/algorithm/small_prng.hpp" -#else -#include "quickcpplib/include/algorithm/small_prng.hpp" -#endif -#elif __PCPP_ALWAYS_TRUE__ -#include "quickcpplib/include/algorithm/small_prng.hpp" -#else -#include "../../quickcpplib/include/algorithm/small_prng.hpp" -#endif +#include "quickcpplib/algorithm/small_prng.hpp" //! \file lock_files.hpp Provides algorithm::shared_fs_mutex::lock_files diff --git a/include/llfio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp b/include/llfio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp index 7f8ff236..9b8c6941 100644 --- a/include/llfio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp +++ b/include/llfio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp @@ -28,25 +28,9 @@ Distributed under the Boost Software License, Version 1.0. #include "../../map_handle.hpp" #include "base.hpp" -#ifdef __has_include -#if __has_include("../../quickcpplib/include/algorithm/hash.hpp") -#include "../../quickcpplib/include/algorithm/hash.hpp" -#include "../../quickcpplib/include/algorithm/small_prng.hpp" -#include "../../quickcpplib/include/spinlock.hpp" -#else -#include "quickcpplib/include/algorithm/hash.hpp" -#include "quickcpplib/include/algorithm/small_prng.hpp" -#include "quickcpplib/include/spinlock.hpp" -#endif -#elif __PCPP_ALWAYS_TRUE__ -#include "quickcpplib/include/algorithm/hash.hpp" -#include "quickcpplib/include/algorithm/small_prng.hpp" -#include "quickcpplib/include/spinlock.hpp" -#else -#include "../../quickcpplib/include/algorithm/hash.hpp" -#include "../../quickcpplib/include/algorithm/small_prng.hpp" -#include "../../quickcpplib/include/spinlock.hpp" -#endif +#include "quickcpplib/algorithm/hash.hpp" +#include "quickcpplib/algorithm/small_prng.hpp" +#include "quickcpplib/spinlock.hpp" //! \file memory_map.hpp Provides algorithm::shared_fs_mutex::memory_map -- cgit v1.2.3