GCC-5.x also needs workaround for std::pair issue

This commit is contained in:
John Maddock
2018-01-27 18:31:28 +00:00
parent a6e879f091
commit 7beb519980

View File

@@ -16,7 +16,7 @@
#if BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40700)
#include <boost/type_traits/is_abstract.hpp>
#endif
#ifdef __clang__
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ == 5))
#include <utility> // std::pair
#endif
@@ -58,7 +58,7 @@ namespace boost{
template <class T, std::size_t N> struct is_default_constructible<T[N]> : public is_default_constructible<T>{};
template <class T> struct is_default_constructible<T[]> : public is_default_constructible<T>{};
template <class T> struct is_default_constructible<T&> : public integral_constant<bool, false>{};
#ifdef __clang__
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ == 5))
template <class T, class U> struct is_default_constructible<std::pair<T,U> > : public integral_constant<bool, is_default_constructible<T>::value && is_default_constructible<U>::value>{};
#endif
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)