From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 29 Feb 2024 17:13:49 +0000 (+0000)
Subject: libstdc++: Suppress deprecation messages from <tbb/task.h> [PR101228]
X-Git-Tag: basepoints/gcc-15~589
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c608b57f77a47179899666940c3b8b6a2e5435b2;p=thirdparty%2Fgcc.git

libstdc++: Suppress deprecation messages from <tbb/task.h> [PR101228]

libstdc++-v3/ChangeLog:

	PR libstdc++/101228
	* include/pstl/parallel_backend_tbb.h (TBB_SUPPRESS_DEPRECATED_MESSAGES):
	Define before including <tbb/task.h> then undef afterwards.
---

diff --git a/libstdc++-v3/include/pstl/parallel_backend_tbb.h b/libstdc++-v3/include/pstl/parallel_backend_tbb.h
index 3ff55237bffa..96e4b709fbee 100644
--- a/libstdc++-v3/include/pstl/parallel_backend_tbb.h
+++ b/libstdc++-v3/include/pstl/parallel_backend_tbb.h
@@ -15,6 +15,11 @@
 
 #include "parallel_backend_utils.h"
 
+#ifndef TBB_SUPPRESS_DEPRECATED_MESSAGES
+# define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
+# define _GLIBCXX_UNDEF_SUPPRESS
+#endif
+
 // Bring in minimal required subset of Intel TBB
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
@@ -25,6 +30,11 @@
 #include <tbb/tbb_allocator.h>
 #include <tbb/task.h>
 
+#ifdef _GLIBCXX_UNDEF_SUPPRESS
+# undef TBB_SUPPRESS_DEPRECATED_MESSAGES
+# undef _GLIBCXX_UNDEF_SUPPRESS
+#endif
+
 #if TBB_INTERFACE_VERSION < 10000
 #    error Intel(R) Threading Building Blocks 2018 is required; older versions are not supported.
 #endif