From b42618d3ea7b574df197a65a962c63012938bd26 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 17 Jul 2019 12:19:11 -0400 Subject: [PATCH] Make sure not to redefine BOOST_NO_AUTO_PTR --- bundled/boost-1.70.0/include/boost/config/stdlib/libcpp.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundled/boost-1.70.0/include/boost/config/stdlib/libcpp.hpp b/bundled/boost-1.70.0/include/boost/config/stdlib/libcpp.hpp index ffe2f2a0f5..66685c8418 100644 --- a/bundled/boost-1.70.0/include/boost/config/stdlib/libcpp.hpp +++ b/bundled/boost-1.70.0/include/boost/config/stdlib/libcpp.hpp @@ -92,7 +92,7 @@ # define BOOST_NO_CXX17_HDR_OPTIONAL # define BOOST_NO_CXX17_HDR_STRING_VIEW #endif -#if (_LIBCPP_VERSION > 4000) && (__cplusplus > 201402L) && !defined(_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR) +#if (_LIBCPP_VERSION > 4000) && (__cplusplus > 201402L) && !defined(_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR) && !defined(BOOST_NO_AUTO_PTR) # define BOOST_NO_AUTO_PTR #endif #if (_LIBCPP_VERSION > 4000) && (__cplusplus > 201402L) && !defined(_LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE) -- 2.39.5