diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2022-12-03 19:55:07 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2022-12-03 19:55:07 +0300 |
| commit | 7adf7eaadc3fe5a045969aa96ef3abe6ba2bf3a3 (patch) | |
| tree | aa4a4ffed1efe97785ea33e83889853bd1428837 | |
| parent | f549b3d7dc37323cac277957d13084624df1a59f (diff) | |
| download | ydb-7adf7eaadc3fe5a045969aa96ef3abe6ba2bf3a3.tar.gz | |
Drop legacy patches from tbb config
| -rw-r--r-- | contrib/libs/tbb/include/oneapi/tbb/detail/_config.h | 9 | ||||
| -rw-r--r-- | contrib/libs/tbb/include/oneapi/tbb/detail/_task.h | 10 |
2 files changed, 3 insertions, 16 deletions
diff --git a/contrib/libs/tbb/include/oneapi/tbb/detail/_config.h b/contrib/libs/tbb/include/oneapi/tbb/detail/_config.h index 7c96ad658e..23157e1b1f 100644 --- a/contrib/libs/tbb/include/oneapi/tbb/detail/_config.h +++ b/contrib/libs/tbb/include/oneapi/tbb/detail/_config.h @@ -324,7 +324,7 @@ #endif #define __TBB_CPP17_UNCAUGHT_EXCEPTIONS_PRESENT (_MSC_VER >= 1900 || __GLIBCXX__ && __cpp_lib_uncaught_exceptions \ - || _LIBCPP_VERSION >= 3700 && (!__TBB_MACOS_TARGET_VERSION || __TBB_MACOS_TARGET_VERSION >= 101200) && !__TBB_IOS) + || _LIBCPP_VERSION >= 3700 && (!__TBB_MACOS_TARGET_VERSION || __TBB_MACOS_TARGET_VERSION >= 101200)) #define __TBB_TSX_INTRINSICS_PRESENT ((__RTM__ || (_MSC_VER>=1700 && !__clang__) || __INTEL_COMPILER>=1300) && !__TBB_DEFINE_MIC && !__ANDROID__) @@ -523,11 +523,4 @@ #define __TBB_PREVIEW_TASK_GROUP_EXTENSIONS 1 #endif - -#if !defined(__APPLE__) || !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED > 101500 - #define __TBB_ALIGNAS_AVAILABLE 1 -#else - #define __TBB_ALIGNAS_AVAILABLE 0 -#endif - #endif // __TBB_detail__config_H diff --git a/contrib/libs/tbb/include/oneapi/tbb/detail/_task.h b/contrib/libs/tbb/include/oneapi/tbb/detail/_task.h index 237c464465..9c1a355084 100644 --- a/contrib/libs/tbb/include/oneapi/tbb/detail/_task.h +++ b/contrib/libs/tbb/include/oneapi/tbb/detail/_task.h @@ -211,12 +211,7 @@ static constexpr std::size_t task_alignment = 64; //! Base class for user-defined tasks. /** @ingroup task_scheduling */ - -class -#if __TBB_ALIGNAS_AVAILABLE -alignas(task_alignment) -#endif -task : public task_traits { +class alignas(task_alignment) task : public task_traits { protected: virtual ~task() = default; @@ -228,9 +223,8 @@ private: std::uint64_t m_reserved[6]{}; friend struct r1::task_accessor; }; -#if __TBB_ALIGNAS_AVAILABLE static_assert(sizeof(task) == task_alignment, "task size is broken"); -#endif + } // namespace d1 } // namespace detail } // namespace tbb |