]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Make sure not to redefine BOOST_NO_AUTO_PTR
authorDaniel Arndt <arndtd@ornl.gov>
Wed, 17 Jul 2019 16:19:11 +0000 (12:19 -0400)
committerDaniel Arndt <arndtd@ornl.gov>
Thu, 18 Jul 2019 20:22:45 +0000 (16:22 -0400)
bundled/boost-1.70.0/include/boost/config/stdlib/libcpp.hpp

index ffe2f2a0f5976b1d025c6754931a14d2ee53801c..66685c84184fcf30cd2e4425efc5c66f0283093a 100644 (file)
@@ -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)

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.