Merge branch 'develop' into feature/result-traits

Update ci.yml
Do not rely on result_type for standard function objects on C++17 or above
2026-04-13 13:15:50 +02:00 · 2021-10-01 01:56:25 +03:00 · 2021-10-01 01:14:41 +03:00 · 2021-10-01 01:07:32 +03:00 · 2021-10-01 00:20:25 +03:00 · 2021-04-19 18:09:51 +03:00
3 changed files with 35 additions and 40 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,24 +17,17 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - toolset: gcc-4.7
-            cxxstd: "03,11"
-            os: ubuntu-16.04
-            install: g++-4.7
          - toolset: gcc-4.8
            cxxstd: "03,11"
-            os: ubuntu-16.04
+            os: ubuntu-18.04
            install: g++-4.8
-          - toolset: gcc-4.9
-            cxxstd: "03,11"
-            os: ubuntu-16.04
-            install: g++-4.9
          - toolset: gcc-5
            cxxstd: "03,11,14,1z"
-            os: ubuntu-16.04
+            os: ubuntu-18.04
+            install: g++-5
          - toolset: gcc-6
            cxxstd: "03,11,14,1z"
-            os: ubuntu-16.04
+            os: ubuntu-18.04
            install: g++-6
          - toolset: gcc-7
            cxxstd: "03,11,14,17"
@@ -42,51 +35,38 @@ jobs:
          - toolset: gcc-8
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-18.04
+            install: g++-8
          - toolset: gcc-9
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
+            os: ubuntu-20.04
          - toolset: gcc-10
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
-          - toolset: clang
-            compiler: clang++-3.5
-            cxxstd: "03,11,14"
-            os: ubuntu-16.04
-            install: clang-3.5
-          - toolset: clang
-            compiler: clang++-3.6
-            cxxstd: "03,11,14"
-            os: ubuntu-16.04
-            install: clang-3.6
-          - toolset: clang
-            compiler: clang++-3.7
-            cxxstd: "03,11,14"
-            os: ubuntu-16.04
-            install: clang-3.7
-          - toolset: clang
-            compiler: clang++-3.8
-            cxxstd: "03,11,14"
-            os: ubuntu-16.04
-            install: clang-3.8
+            os: ubuntu-20.04
+            install: g++-10
+          - toolset: gcc-11
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
+            install: g++-11
          - toolset: clang
            compiler: clang++-3.9
            cxxstd: "03,11,14"
-            os: ubuntu-16.04
+            os: ubuntu-18.04
            install: clang-3.9
          - toolset: clang
            compiler: clang++-4.0
            cxxstd: "03,11,14"
-            os: ubuntu-16.04
+            os: ubuntu-18.04
            install: clang-4.0
          - toolset: clang
            compiler: clang++-5.0
            cxxstd: "03,11,14,1z"
-            os: ubuntu-16.04
+            os: ubuntu-18.04
            install: clang-5.0
          - toolset: clang
            compiler: clang++-6.0
            cxxstd: "03,11,14,17"
            os: ubuntu-18.04
+            install: clang-6.0
          - toolset: clang
            compiler: clang++-7
            cxxstd: "03,11,14,17"
@@ -94,16 +74,29 @@ jobs:
            install: clang-7
          - toolset: clang
            compiler: clang++-8
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "03,11,14,17"
            os: ubuntu-20.04
+            install: clang-8
          - toolset: clang
            compiler: clang++-9
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-20.04
+            install: clang-9
          - toolset: clang
            compiler: clang++-10
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-20.04
+            install: clang-10
+          - toolset: clang
+            compiler: clang++-11
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
+            install: clang-11
+          - toolset: clang
+            compiler: clang++-12
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
+            install: clang-12
          - toolset: clang
            cxxstd: "03,11,14,17,2a"
            os: macos-10.15
--- a/.travis.yml
+++ b/.travis.yml
@@ -311,7 +311,7 @@ matrix:
      env: CMAKE_TEST=1
      script:
        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=bind ..
+        - cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=bind ..
        - ctest --output-on-failure -R boost_bind

    - os: linux
--- a/include/boost/bind/detail/result_traits.hpp
+++ b/include/boost/bind/detail/result_traits.hpp
@@ -21,7 +21,9 @@
 //  See http://www.boost.org/libs/bind/bind.html for documentation.
 //

-#if defined(_MSVC_LANG) && _MSVC_LANG >= 17
+#include <boost/config.hpp>
+
+#if BOOST_CXX_VERSION >= 201700L
 #include <functional>
 #endif

@@ -48,7 +50,7 @@ template<class F> struct result_traits< unspecified, reference_wrapper<F> >
    typedef typename F::result_type type;
 };

-#if defined(_MSVC_LANG) && _MSVC_LANG >= 17
+#if BOOST_CXX_VERSION >= 201700L

 template<class T> struct result_traits< unspecified, std::plus<T> >
 {
Author	SHA1	Message	Date
Peter Dimov	24bd5e7e5b	Merge branch 'develop' into feature/result-traits	2021-10-01 01:56:25 +03:00
Peter Dimov	b0b2ed2814	Update ci.yml	2021-10-01 01:14:41 +03:00
Peter Dimov	b719777942	Do not rely on result_type for standard function objects on C++17 or above	2021-10-01 01:07:32 +03:00
Peter Dimov	5b1fe62dbb	Update ci.yml	2021-10-01 00:20:25 +03:00
Peter Dimov	34a3ee580c	Update .github/workflows	2021-04-19 18:09:51 +03:00
Peter Dimov	ebc0c07e96	Add -DBUILD_TESTING=ON to .yml files; it's not default anymore	2021-03-19 03:51:47 +02:00