aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2023-09-26 22:34:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-26 22:34:03 +0000
commit3d6ff503f808d81f529d52b3c95647ca42fd1b8b (patch)
tree0e363efcd4c3d7e24c97cf7efa52c54623e9d66e
parentec71062d30717544b768022c8f883913b477977c (diff)
parent1ad8ebf4b7ada310e4b70b3e1940aa58bea9604a (diff)
downloadvsomeip-3d6ff503f808d81f529d52b3c95647ca42fd1b8b.tar.gz
Merge "Define BOOST_NO_CXX98_FUNCTION_BASE for new libc++" into main am: ab80376633 am: 1ad8ebf4b7
Original change: https://android-review.googlesource.com/c/platform/external/sdv/vsomeip/+/2763085 Change-Id: I063155af2db8ac7b5c9a1b903673e29ef08a5874 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--third_party/boost/config/include/boost/config/stdlib/libcpp.hpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/third_party/boost/config/include/boost/config/stdlib/libcpp.hpp b/third_party/boost/config/include/boost/config/stdlib/libcpp.hpp
index ed51c058..001e7c3c 100644
--- a/third_party/boost/config/include/boost/config/stdlib/libcpp.hpp
+++ b/third_party/boost/config/include/boost/config/stdlib/libcpp.hpp
@@ -162,4 +162,13 @@
# define BOOST_NO_CXX14_HDR_SHARED_MUTEX
#endif
+#if _LIBCPP_VERSION >= 15000
+//
+// Unary function is now deprecated in C++11 and later:
+//
+#if __cplusplus >= 201103L
+#define BOOST_NO_CXX98_FUNCTION_BASE
+#endif
+#endif
+
// --- end ---