From 023f45be010eb0d6841e7c6bb7167050cd57bd32 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 30 Sep 2018 01:34:50 +0300 Subject: [PATCH] Remove constexpr from begin/end on g++ 4.6 as it doesn't like it --- include/boost/range/begin.hpp | 12 ++++++++++-- include/boost/range/end.hpp | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/include/boost/range/begin.hpp b/include/boost/range/begin.hpp index 0d7d3db1c..4f53d4688 100644 --- a/include/boost/range/begin.hpp +++ b/include/boost/range/begin.hpp @@ -22,6 +22,8 @@ #else #include +#include +#include namespace boost { @@ -94,7 +96,10 @@ namespace range_adl_barrier { template< class T > -BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator::type begin( T& r ) +#if !BOOST_WORKAROUND(BOOST_GCC, < 40700) +BOOST_CONSTEXPR +#endif +inline BOOST_DEDUCED_TYPENAME range_iterator::type begin( T& r ) { #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) using namespace range_detail; @@ -103,7 +108,10 @@ BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator::type begin( T& } template< class T > -BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator::type begin( const T& r ) +#if !BOOST_WORKAROUND(BOOST_GCC, < 40700) +BOOST_CONSTEXPR +#endif +inline BOOST_DEDUCED_TYPENAME range_iterator::type begin( const T& r ) { #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) using namespace range_detail; diff --git a/include/boost/range/end.hpp b/include/boost/range/end.hpp index 588495cee..eab4fa9f5 100644 --- a/include/boost/range/end.hpp +++ b/include/boost/range/end.hpp @@ -24,6 +24,8 @@ #include #include #include +#include +#include namespace boost { @@ -88,7 +90,10 @@ namespace range_adl_barrier { template< class T > -BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator::type end( T& r ) +#if !BOOST_WORKAROUND(BOOST_GCC, < 40700) +BOOST_CONSTEXPR +#endif +inline BOOST_DEDUCED_TYPENAME range_iterator::type end( T& r ) { #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) using namespace range_detail; @@ -97,7 +102,10 @@ BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator::type end( T& r } template< class T > -BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator::type end( const T& r ) +#if !BOOST_WORKAROUND(BOOST_GCC, < 40700) +BOOST_CONSTEXPR +#endif +inline BOOST_DEDUCED_TYPENAME range_iterator::type end( const T& r ) { #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) using namespace range_detail;