Ticket #54176: patch-libcpp-everywhere.diff

boost/container/

@@ -1661 +1661 @@
 
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
-#if defined(__clang__) && defined(_LIBCPP_VERSION)
+#if defined(_LIBCPP_VERSION)
    #define BOOST_CONTAINER_CLANG_INLINE_STD_NS
    #pragma GCC diagnostic push
    #pragma GCC diagnostic ignored "-Wc++11-extensions"

boost/asio/detail/

@@ -71 +71 @@
 #endif // defined(BOOST_ASIO_MSVC)
 
 // Clang / libc++ detection.
-#if defined(__clang__)
+// #if defined(__clang__)
 # if (__cplusplus >= 201103)
 #  if __has_include(<__config>)
 #   include <__config>
@@ -80 +80 @@
 #   endif // defined(_LIBCPP_VERSION)
 #  endif // __has_include(<__config>)
 # endif // (__cplusplus >= 201103)
-#endif // defined(__clang__)
+// #endif // defined(__clang__)
 
 // Support move construction and assignment on compilers known to allow it.
 #if !defined(BOOST_ASIO_HAS_MOVE)

iterator_traits.hpp

@@ -24 +24 @@
 
 #include <cstddef>
 
-#if defined(__clang__) && defined(_LIBCPP_VERSION)
+#if defined(_LIBCPP_VERSION)
    #define BOOST_MOVE_CLANG_INLINE_STD_NS
-   #pragma GCC diagnostic push
-   #pragma GCC diagnostic ignored "-Wc++11-extensions"
+   #if defined(__clang__)
+      #pragma GCC diagnostic push
+      #pragma GCC diagnostic ignored "-Wc++11-extensions"
+   #endif
    #define BOOST_MOVE_STD_NS_BEG _LIBCPP_BEGIN_NAMESPACE_STD
    #define BOOST_MOVE_STD_NS_END _LIBCPP_END_NAMESPACE_STD
 #else

libs/program_options/src/

@@ -6 +6 @@
 
 #include <boost/config.hpp>
 
+#if defined(_LIBCPP_VERSION) && !defined(__clang__)
+#include <set>
+#endif
+
 #define BOOST_PROGRAM_OPTIONS_SOURCE
 #include <boost/program_options/config.hpp>
 #include <boost/program_options/parsers.hpp>