From: Daniel Arndt Date: Wed, 17 Jul 2019 16:19:11 +0000 (-0400) Subject: Make sure not to redefine BOOST_NO_AUTO_PTR X-Git-Tag: v9.2.0-rc1~1337^2~3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b42618d3ea7b574df197a65a962c63012938bd26;p=dealii.git Make sure not to redefine BOOST_NO_AUTO_PTR --- 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)