Merge branch 'develop'

Remove constexpr from begin/end on g++ 4.6 as it doesn't like it
Use boost::declval, as g++ 4.4 has decltype but no std::declval
2025-12-28 01:28:16 +01:00 · 2018-10-01 15:42:04 +03:00 · 2018-09-30 01:34:50 +03:00 · 2018-09-30 01:11:12 +03:00 · 2018-09-29 17:34:43 +03:00 · 2018-07-12 16:59:32 +03:00
4 changed files with 42 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,26 @@ matrix:
      compiler: g++
      env: TOOLSET=gcc CXXSTD=03,11

+    - os: linux
+      compiler: g++-4.4
+      env: TOOLSET=gcc-4.4 CXXSTD=98,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.4
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.6
+      env: TOOLSET=gcc-4.6 CXXSTD=03,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.6
+          sources:
+            - ubuntu-toolchain-r-test
+
    - os: linux
      compiler: g++-5
      env: TOOLSET=gcc-5 CXXSTD=03,11
--- a/include/boost/range/adaptor/ref_unwrapped.hpp
+++ b/include/boost/range/adaptor/ref_unwrapped.hpp
@@ -15,7 +15,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/reference.hpp>
 #include <boost/range/concepts.hpp>
-
+#include <boost/type_traits/declval.hpp>
 #include <utility>

 #if !defined(BOOST_NO_CXX11_DECLTYPE)
@@ -32,7 +32,7 @@ namespace boost
            typedef BOOST_DEDUCED_TYPENAME
                          range_reference<SinglePassRange>::type argument_type;

-            typedef decltype(std::declval<argument_type>().get() ) result_type;
+            typedef decltype( boost::declval<argument_type>().get() ) result_type;

            result_type operator()( argument_type &&r ) const
            {
--- a/include/boost/range/begin.hpp
+++ b/include/boost/range/begin.hpp
@@ -22,6 +22,8 @@
 #else

 #include <boost/range/iterator.hpp>
+#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>

 namespace boost
 {
@@ -94,7 +96,10 @@ namespace range_adl_barrier
 {

 template< class T >
-BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r )
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40700)
+BOOST_CONSTEXPR
+#endif
+inline BOOST_DEDUCED_TYPENAME range_iterator<T>::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<T>::type begin( T&
 }

 template< class T >
-BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40700)
+BOOST_CONSTEXPR
+#endif
+inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
 {
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
    using namespace range_detail;
--- a/include/boost/range/end.hpp
+++ b/include/boost/range/end.hpp
@@ -24,6 +24,8 @@
 #include <boost/range/detail/implementation_help.hpp>
 #include <boost/range/iterator.hpp>
 #include <boost/range/const_iterator.hpp>
+#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>

 namespace boost
 {
@@ -88,7 +90,10 @@ namespace range_adl_barrier
 {

 template< class T >
-BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r )
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40700)
+BOOST_CONSTEXPR
+#endif
+inline BOOST_DEDUCED_TYPENAME range_iterator<T>::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<T>::type end( T& r
 }

 template< class T >
-BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type end( const T& r )
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40700)
+BOOST_CONSTEXPR
+#endif
+inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type end( const T& r )
 {
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
    using namespace range_detail;
Author	SHA1	Message	Date
Peter Dimov	9f94c8703b	Merge branch 'develop'	2018-10-01 15:42:04 +03:00
Peter Dimov	023f45be01	Remove constexpr from begin/end on g++ 4.6 as it doesn't like it	2018-09-30 01:34:50 +03:00
Peter Dimov	364f755d99	Use boost::declval, as g++ 4.4 has decltype but no std::declval	2018-09-30 01:11:12 +03:00
Peter Dimov	af9f65e06e	Add g++-4.4, g++-4.6 to Travis	2018-09-29 17:34:43 +03:00
Peter Dimov	4cfd4d8287	Merge branch 'develop'	2018-07-12 16:59:32 +03:00
Neil Groves	314b5d6b3c	Merge branch 'develop'	2018-04-18 11:04:16 +01:00
Peter Dimov	b1d5d23514	Add `quick` test target (for CI)	2017-12-18 21:14:16 +02:00
Daniel James	aaebfa5b20	Include boost/next_prior.hpp where needed A recent change to boost/utility.hpp removed the include of this header, so now it's needed for boost::prior and boost::next. `b74f49f1e5`	2017-12-18 21:14:06 +02:00
Peter Dimov	95a62a3b3a	Split Travis jobs to avoid timeout	2017-12-03 15:16:45 +02:00
Peter Dimov	67929cd7df	Add .travis.yml	2017-12-03 15:16:25 +02:00
Peter Dimov	efdd98332b	Qualify boost::search in test/algorithm to avoid ambiguity with C++17's std::search	2017-09-10 03:03:16 +03:00
Marcel Raad	97951d2a8b	Fix test compilation boost::detail::iterator_traits was used without including the necessary header file. It's deprecated anyway and only maps to std::iterator_traits. Also, utility was missing for std::pair.	2017-09-10 02:21:53 +03:00
Marcel Raad	efa2dc71f9	Fix compilation boost::detail::iterator_traits was used without including the necessary header file. It's deprecated anyway and only maps to std::iterator_traits.	2017-09-09 23:37:16 +03:00