diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2021-03-15 13:40:27 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2021-03-15 13:40:27 +0300 |
| commit | 545a722a055dcc38e7f80520a7a34008bfa9a86f (patch) | |
| tree | d4515691fb7b4ac80ce360e52b08b9fdc5311d70 | |
| parent | 17d8156ac89e3b8c6aa19a14e0dd723bd65e0902 (diff) | |
Make the presence of `__cpp_modules` not have an effect on its own (#75)
| -rw-r--r-- | include/llfio/revision.hpp | 6 | ||||
| -rw-r--r-- | include/llfio/v2.0/detail/impl/windows/directory_handle.ipp | 3 | ||||
| -rw-r--r-- | include/llfio/v2.0/directory_handle.hpp | 2 | ||||
| -rw-r--r-- | include/llfio/v2.0/llfio.hpp | 12 |
4 files changed, 13 insertions, 10 deletions
diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index 06790036..ef743f15 100644 --- a/include/llfio/revision.hpp +++ b/include/llfio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define LLFIO_PREVIOUS_COMMIT_REF a74411eddb6401ab884c5f92cccc24b9a64a9e6f -#define LLFIO_PREVIOUS_COMMIT_DATE "2021-02-23 14:33:57 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE a74411ed +#define LLFIO_PREVIOUS_COMMIT_REF 17d8156ac89e3b8c6aa19a14e0dd723bd65e0902 +#define LLFIO_PREVIOUS_COMMIT_DATE "2021-03-09 09:38:56 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE 17d8156a diff --git a/include/llfio/v2.0/detail/impl/windows/directory_handle.ipp b/include/llfio/v2.0/detail/impl/windows/directory_handle.ipp index 10fcf849..60e34e5e 100644 --- a/include/llfio/v2.0/detail/impl/windows/directory_handle.ipp +++ b/include/llfio/v2.0/detail/impl/windows/directory_handle.ipp @@ -23,6 +23,9 @@ http://www.boost.org/LICENSE_1_0.txt) */ #include "../../../directory_handle.hpp" + +#include "../../../file_handle.hpp" + #include "import.hpp" LLFIO_V2_NAMESPACE_BEGIN diff --git a/include/llfio/v2.0/directory_handle.hpp b/include/llfio/v2.0/directory_handle.hpp index a95272aa..6d185ef8 100644 --- a/include/llfio/v2.0/directory_handle.hpp +++ b/include/llfio/v2.0/directory_handle.hpp @@ -1,5 +1,5 @@ /* A handle to a directory -(C) 2017 Niall Douglas <http://www.nedproductions.biz/> (20 commits) +(C) 2017-2021 Niall Douglas <http://www.nedproductions.biz/> (20 commits) File Created: Aug 2017 diff --git a/include/llfio/v2.0/llfio.hpp b/include/llfio/v2.0/llfio.hpp index 7beb7620..88bfad2b 100644 --- a/include/llfio/v2.0/llfio.hpp +++ b/include/llfio/v2.0/llfio.hpp @@ -34,7 +34,10 @@ // If C++ Modules are on and we are not compiling the library, // we are either generating the interface or importing -#if defined(__cpp_modules) +#if !defined(__cpp_modules) || defined(GENERATING_LLFIO_MODULE_INTERFACE) || LLFIO_DISABLE_CXX_MODULES +// C++ Modules not on, therefore include as usual +#define LLFIO_INCLUDE_ALL +#else #if defined(GENERATING_LLFIO_MODULE_INTERFACE) // We are generating this module's interface #define QUICKCPPLIB_HEADERS_ONLY 0 @@ -48,9 +51,6 @@ import LLFIO_MODULE_NAME; #undef LLFIO_INCLUDE_ALL #endif -#else -// C++ Modules not on, therefore include as usual -#define LLFIO_INCLUDE_ALL #endif #ifdef LLFIO_INCLUDE_ALL @@ -62,9 +62,9 @@ import LLFIO_MODULE_NAME; #include "stat.hpp" #include "utils.hpp" +#include "directory_handle.hpp" #include "file_handle.hpp" #include "process_handle.hpp" -#include "directory_handle.hpp" #include "statfs.hpp" #ifdef LLFIO_INCLUDE_STORAGE_PROFILE #include "storage_profile.hpp" @@ -83,10 +83,10 @@ import LLFIO_MODULE_NAME; #include "algorithm/summarize.hpp" #ifndef LLFIO_EXCLUDE_MAPPED_FILE_HANDLE -#include "mapped.hpp" #include "algorithm/handle_adapter/xor.hpp" #include "algorithm/shared_fs_mutex/memory_map.hpp" #include "algorithm/trivial_vector.hpp" +#include "mapped.hpp" #endif #endif |