From 7beb5199800795f3a4e4e656c8c59573296c9c33 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sat, 27 Jan 2018 18:31:28 +0000 Subject: [PATCH] GCC-5.x also needs workaround for std::pair issue --- include/boost/type_traits/is_default_constructible.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/type_traits/is_default_constructible.hpp b/include/boost/type_traits/is_default_constructible.hpp index 99c911f..b463748 100644 --- a/include/boost/type_traits/is_default_constructible.hpp +++ b/include/boost/type_traits/is_default_constructible.hpp @@ -16,7 +16,7 @@ #if BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40700) #include #endif -#ifdef __clang__ +#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ == 5)) #include // std::pair #endif @@ -58,7 +58,7 @@ namespace boost{ template struct is_default_constructible : public is_default_constructible{}; template struct is_default_constructible : public is_default_constructible{}; template struct is_default_constructible : public integral_constant{}; -#ifdef __clang__ +#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ == 5)) template struct is_default_constructible > : public integral_constant::value && is_default_constructible::value>{}; #endif #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)