forked from bartvdbraak/blender
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
diff --git a/include/tbb/tbb_config.h b/include/tbb/tbb_config.h
|
|
index 7a8d06a0..886699d8 100644
|
|
--- a/include/tbb/tbb_config.h
|
|
+++ b/include/tbb/tbb_config.h
|
|
@@ -620,7 +620,7 @@ There are four cases that are supported:
|
|
// instantiation site, which is too late for suppression of the corresponding messages for internal
|
|
// stuff.
|
|
#if !defined(__INTEL_COMPILER) && (!defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) || (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0))
|
|
- #if (__cplusplus >= 201402L)
|
|
+ #if (__cplusplus >= 201402L && (!defined(_MSC_VER) || _MSC_VER >= 1920))
|
|
#define __TBB_DEPRECATED [[deprecated]]
|
|
#define __TBB_DEPRECATED_MSG(msg) [[deprecated(msg)]]
|
|
#elif _MSC_VER
|
|
--- a/src/tbb/tools_api/ittnotify_config.h
|
|
+++ b/src/tbb/tools_api/ittnotify_config.h
|
|
@@ -162,7 +162,7 @@
|
|
# define ITT_ARCH ITT_ARCH_IA32E
|
|
# elif defined _M_IA64 || defined __ia64__
|
|
# define ITT_ARCH ITT_ARCH_IA64
|
|
-# elif defined _M_ARM || defined __arm__
|
|
+# elif defined _M_ARM || defined __arm__ || defined __aarch64__
|
|
# define ITT_ARCH ITT_ARCH_ARM
|
|
# elif defined __powerpc64__
|
|
# define ITT_ARCH ITT_ARCH_PPC64
|