X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=3rdparty%2Fboost%2Fboost%2Frange%2Fend.hpp;h=eab4fa9f5b58e60795b976850320f5b95913bdf5;hb=09130d7a622;hp=588495cee58da8b03b2e4226a1d9237f397b8fea;hpb=294969c6a2ba456c231e52d79b4637cdd50a6a95;p=lyx.git diff --git a/3rdparty/boost/boost/range/end.hpp b/3rdparty/boost/boost/range/end.hpp index 588495cee5..eab4fa9f5b 100644 --- a/3rdparty/boost/boost/range/end.hpp +++ b/3rdparty/boost/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;