diff options
| author | Niall Douglas <s_github@nedprod.com> | 2022-09-05 19:25:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-05 19:25:40 +0300 |
| commit | fa0940ef959827831f6bbb5ddc7c53c04514d8a6 (patch) | |
| tree | 25cd6bd0170021a2ab27f919c658378d5f11fc64 | |
| parent | 7986b92283e2d92991fbbc77850faf6025932dc4 (diff) | |
| parent | c1079f9a58cdd705f33b2b7010a7203af1aae42b (diff) | |
Merge pull request #99 from BurningEnlightenment/dev/98-msvc-workaround-extension
Enable MSVC STL workaround until next major toolset version
| -rw-r--r-- | include/llfio/revision.hpp | 6 | ||||
| -rw-r--r-- | include/llfio/v2.0/detail/impl/traverse.ipp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index 48c717e4..8fa209df 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 a5dc363fa7fb5b6eed09943da25ac13506fd4ff6 -#define LLFIO_PREVIOUS_COMMIT_DATE "2022-08-15 07:35:23 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE a5dc363f +#define LLFIO_PREVIOUS_COMMIT_REF 7986b92283e2d92991fbbc77850faf6025932dc4 +#define LLFIO_PREVIOUS_COMMIT_DATE "2022-09-01 16:30:55 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE 7986b922 diff --git a/include/llfio/v2.0/detail/impl/traverse.ipp b/include/llfio/v2.0/detail/impl/traverse.ipp index 06354fe8..7d7077a6 100644 --- a/include/llfio/v2.0/detail/impl/traverse.ipp +++ b/include/llfio/v2.0/detail/impl/traverse.ipp @@ -162,8 +162,7 @@ namespace algorithm using_sso = true; } } -#if _MSC_VER < 1933 // <= VS2022.2 - // MSVC's list::splice() always copies :( +#if _MSVC_STL_VERSION < 150 // see ned14/llfio#98 workitem(const workitem &o) noexcept : workitem(const_cast<workitem &&>(std::move(o))) { |