diff options
| author | Niall Douglas <s_github@nedprod.com> | 2022-08-18 17:08:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-18 17:08:30 +0300 |
| commit | 48ea96b25766da66eb80d8a2769c5329f5bf8b86 (patch) | |
| tree | 3f0a223dc7d3622bdf12c401e690c1e1e6a46adf | |
| parent | 78ffd9011dfc053c4034531f4ba8c7d279da80ae (diff) | |
| parent | 6a9b3dd3afd74b5414421c1445183b36a3b33edb (diff) | |
Merge pull request #93 from BurningEnlightenment/dev/fix-vendored-status-code-include
Fix unconditional vendored status code include
| -rw-r--r-- | include/llfio/revision.hpp | 6 | ||||
| -rw-r--r-- | include/llfio/v2.0/detail/impl/posix/byte_socket_handle.ipp | 4 | ||||
| -rw-r--r-- | include/llfio/v2.0/status_code.hpp | 4 | ||||
| -rw-r--r-- | test/test_kernel_decl.hpp | 4 |
4 files changed, 15 insertions, 3 deletions
diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index d368598d..48c717e4 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 613d870764cc19e7005a930d8dac689adcbb940b -#define LLFIO_PREVIOUS_COMMIT_DATE "2022-05-24 17:41:32 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE 613d8707 +#define LLFIO_PREVIOUS_COMMIT_REF a5dc363fa7fb5b6eed09943da25ac13506fd4ff6 +#define LLFIO_PREVIOUS_COMMIT_DATE "2022-08-15 07:35:23 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE a5dc363f diff --git a/include/llfio/v2.0/detail/impl/posix/byte_socket_handle.ipp b/include/llfio/v2.0/detail/impl/posix/byte_socket_handle.ipp index 25c5bcd3..8d485b04 100644 --- a/include/llfio/v2.0/detail/impl/posix/byte_socket_handle.ipp +++ b/include/llfio/v2.0/detail/impl/posix/byte_socket_handle.ipp @@ -26,8 +26,12 @@ Distributed under the Boost Software License, Version 1.0. #include "import.hpp" #if LLFIO_EXPERIMENTAL_STATUS_CODE +#if !OUTCOME_USE_SYSTEM_STATUS_CODE && __has_include("outcome/experimental/status-code/include/status-code/getaddrinfo_code.hpp") #include "outcome/experimental/status-code/include/status-code/getaddrinfo_code.hpp" #else +#include <status-code/getaddrinfo_code.hpp> +#endif +#else #include "../getaddrinfo_category.hpp" #endif diff --git a/include/llfio/v2.0/status_code.hpp b/include/llfio/v2.0/status_code.hpp index cdd04a98..eb1b2959 100644 --- a/include/llfio/v2.0/status_code.hpp +++ b/include/llfio/v2.0/status_code.hpp @@ -57,7 +57,11 @@ as that (a) enables safe header only LLFIO on Windows (b) produces better codege #include "outcome/try.hpp" // Bring in status code utility #include "outcome/experimental/coroutine_support.hpp" +#if !OUTCOME_USE_SYSTEM_STATUS_CODE && __has_include("outcome/experimental/status-code/include/status-code/system_code_from_exception.hpp") #include "outcome/experimental/status-code/include/status-code/system_code_from_exception.hpp" +#else +#include <status-code/system_code_from_exception.hpp> +#endif #if !defined(LLFIO_ENABLE_COROUTINES) && defined(OUTCOME_FOUND_COROUTINE_HEADER) #define LLFIO_ENABLE_COROUTINES 1 #endif diff --git a/test/test_kernel_decl.hpp b/test/test_kernel_decl.hpp index 3bd810cf..fe89eb58 100644 --- a/test/test_kernel_decl.hpp +++ b/test/test_kernel_decl.hpp @@ -38,7 +38,11 @@ Distributed under the Boost Software License, Version 1.0. #if LLFIO_EXPERIMENTAL_STATUS_CODE #define KERNELTEST_EXPERIMENTAL_STATUS_CODE 1 +#if !OUTCOME_USE_SYSTEM_STATUS_CODE && __has_include("outcome/experimental/status-code/include/status-code/iostream_support.hpp") #include "outcome/experimental/status-code/include/status-code/iostream_support.hpp" +#else +#include <status-code/iostream_support.hpp> +#endif // Used for initialiser list stored results as the erased form is move-only template <class T> using il_result = OUTCOME_V2_NAMESPACE::experimental::status_result<T, SYSTEM_ERROR2_NAMESPACE::generic_code>; |