Disable constexpr on g++ 5

This commit is contained in:
Peter Dimov
2018-09-22 21:00:06 +03:00
parent e7c1079c4f
commit 91aeb86f57
2 changed files with 4 additions and 19 deletions

View File

@@ -33,6 +33,10 @@
# define BOOST_SYSTEM_HAS_CONSTEXPR # define BOOST_SYSTEM_HAS_CONSTEXPR
#endif #endif
#if BOOST_WORKAROUND(BOOST_GCC, < 60000)
# undef BOOST_SYSTEM_HAS_CONSTEXPR
#endif
#if defined(BOOST_SYSTEM_HAS_CONSTEXPR) #if defined(BOOST_SYSTEM_HAS_CONSTEXPR)
# define BOOST_SYSTEM_CONSTEXPR constexpr # define BOOST_SYSTEM_CONSTEXPR constexpr
#else #else

View File

@@ -392,25 +392,6 @@ inline bool failed_impl( int ev, error_category const & cat )
return cat.failed( ev ); return cat.failed( ev );
} }
#elif BOOST_WORKAROUND(BOOST_GCC, < 60000)
inline bool failed2_impl( int ev, error_category const & cat )
{
return cat.failed( ev );
}
BOOST_SYSTEM_CONSTEXPR inline bool failed_impl( int ev, error_category const & cat )
{
if( cat == system_category() || cat == generic_category() )
{
return ev != 0;
}
else
{
return failed2_impl( ev, cat );
}
}
#else #else
BOOST_SYSTEM_CONSTEXPR inline bool failed_impl( int ev, error_category const & cat ) BOOST_SYSTEM_CONSTEXPR inline bool failed_impl( int ev, error_category const & cat )