diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2021-04-15 13:37:07 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2021-04-15 13:37:07 +0300 |
| commit | db383d69b71ae5dab99e8e90699629c1a684f4ee (patch) | |
| tree | 5cf5803690157aa8c2382257292b687064112165 /include | |
| parent | 2040dcb520d92328a9318b948c380e1692f41249 (diff) | |
Merge https://github.com/ned14/llfio/pull/77 into my current working tree and push the bits which are safe to push for now.
Diffstat (limited to 'include')
| -rw-r--r-- | include/llfio/llfio.hpp | 2 | ||||
| -rw-r--r-- | include/llfio/v2.0/detail/impl/dynamic_thread_pool_group.ipp | 1 | ||||
| -rw-r--r-- | include/llfio/v2.0/llfio.hpp | 2 | ||||
| -rw-r--r-- | include/llfio/version.hpp | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/include/llfio/llfio.hpp b/include/llfio/llfio.hpp index 180df4ae..e5fbb0d9 100644 --- a/include/llfio/llfio.hpp +++ b/include/llfio/llfio.hpp @@ -1,7 +1,7 @@ //! \file llfio/llfio.hpp The master *latest version* LLFIO include file. All LLFIO consuming libraries should include this header only. #include "version.hpp" -#if defined(_MSC_VER) && !defined(__clang__) +#if defined(_MSC_VER) && !defined(__clang__) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL) #define LLFIO_HEADERS_PATH2 LLFIO_VERSION_GLUE(v, LLFIO_HEADERS_VERSION, /llfio.hpp) #elif !__PCPP_ALWAYS_FALSE__ #define LLFIO_HEADERS_PATH2 LLFIO_VERSION_GLUE(v, LLFIO_HEADERS_VERSION,)/llfio.hpp diff --git a/include/llfio/v2.0/detail/impl/dynamic_thread_pool_group.ipp b/include/llfio/v2.0/detail/impl/dynamic_thread_pool_group.ipp index 287683bf..08e6762e 100644 --- a/include/llfio/v2.0/detail/impl/dynamic_thread_pool_group.ipp +++ b/include/llfio/v2.0/detail/impl/dynamic_thread_pool_group.ipp @@ -1261,7 +1261,6 @@ class dynamic_thread_pool_group_impl final : public dynamic_thread_pool_group #else void *_grouph{nullptr}; size_t _newly_added_active_work_items{0}; - size_t _timer_work_items_remaining{0}; size_t _active_work_items_remaining{0}; #endif diff --git a/include/llfio/v2.0/llfio.hpp b/include/llfio/v2.0/llfio.hpp index a7c23b27..0cb651e6 100644 --- a/include/llfio/v2.0/llfio.hpp +++ b/include/llfio/v2.0/llfio.hpp @@ -23,7 +23,7 @@ #define LLFIO_NAMESPACE_VERSION LLFIO_VERSION_GLUE(LLFIO_VERSION_MAJOR, _, LLFIO_VERSION_MINOR) #if defined(__cpp_modules) || defined(DOXYGEN_SHOULD_SKIP_THIS) -#if defined(_MSC_VER) && !defined(__clang__) +#if defined(_MSC_VER) && !defined(__clang__) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL) //! \brief The LLFIO C++ module name #define LLFIO_MODULE_NAME LLFIO_VERSION_GLUE(llfio_v, LLFIO_NAMESPACE_VERSION, ) #else diff --git a/include/llfio/version.hpp b/include/llfio/version.hpp index f5421418..a9eb862e 100644 --- a/include/llfio/version.hpp +++ b/include/llfio/version.hpp @@ -25,7 +25,7 @@ #define LLFIO_VERSION_GLUE(a, b, c) LLFIO_VERSION_GLUE2(a, b, c) #define LLFIO_NAMESPACE_VERSION LLFIO_VERSION_GLUE(LLFIO_VERSION_MAJOR, _, LLFIO_VERSION_MINOR) -#if defined(_MSC_VER) && !defined(__clang__) +#if defined(_MSC_VER) && !defined(__clang__) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL) #define LLFIO_HEADERS_VERSION LLFIO_VERSION_GLUE(LLFIO_VERSION_MAJOR, ., LLFIO_VERSION_MINOR) #else #define LLFIO_HEADERS_VERSION LLFIO_VERSION_MAJOR.LLFIO_VERSION_MINOR |