Remove C++03 from Travis

Use std::mem_fn, std::bind
Update .travis.yml
2026-04-13 21:25:59 +02:00 · 2019-11-06 01:35:19 +02:00 · 2019-11-05 18:58:02 +02:00 · 2019-06-18 12:43:31 +03:00 · 2019-04-23 10:18:06 -07:00 · 2019-04-23 19:04:59 +02:00
6 changed files with 126 additions and 59 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ language: cpp

 sudo: false

+dist: trusty
+
 branches:
  only:
    - master
@@ -24,21 +26,11 @@ matrix:
  include:
    - os: linux
      compiler: g++
-      env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
-
-    - os: linux
-      compiler: g++-4.4
-      env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98
-      addons:
-        apt:
-          packages:
-            - g++-4.4
-          sources:
-            - ubuntu-toolchain-r-test
+      env: TOOLSET=gcc COMPILER=g++ CXXSTD=11

    - os: linux
      compiler: g++-4.6
-      env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
+      env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=0x
      addons:
        apt:
          packages:
@@ -48,7 +40,7 @@ matrix:

    - os: linux
      compiler: g++-4.7
-      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
+      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=11
      addons:
        apt:
          packages:
@@ -58,7 +50,7 @@ matrix:

    - os: linux
      compiler: g++-4.8
-      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
+      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=11
      addons:
        apt:
          packages:
@@ -67,7 +59,7 @@ matrix:
            - ubuntu-toolchain-r-test
    - os: linux
      compiler: g++-4.9
-      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
+      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=11
      addons:
        apt:
          packages:
@@ -77,7 +69,7 @@ matrix:

    - os: linux
      compiler: g++-5
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14,1z
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -87,7 +79,7 @@ matrix:

    - os: linux
      compiler: g++-6
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -98,7 +90,7 @@ matrix:
    - os: linux
      dist: trusty
      compiler: g++-7
-      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
+      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=11,14,17
      addons:
        apt:
          packages:
@@ -108,7 +100,7 @@ matrix:

    - os: linux
      compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17,2a
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=11,14,17,2a
      addons:
        apt:
          packages:
@@ -116,13 +108,23 @@ matrix:
          sources:
            - ubuntu-toolchain-r-test

+    - os: linux
+      compiler: g++-9
+      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - g++-9
+          sources:
+            - ubuntu-toolchain-r-test
+
    - os: linux
      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=11

    - os: linux
      compiler: /usr/bin/clang++
-      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
+      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=11
      addons:
        apt:
          packages:
@@ -130,7 +132,7 @@ matrix:

    - os: linux
      compiler: /usr/bin/clang++
-      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
+      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=11
      addons:
        apt:
          packages:
@@ -138,7 +140,7 @@ matrix:

    - os: linux
      compiler: clang++-3.5
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -150,7 +152,7 @@ matrix:

    - os: linux
      compiler: clang++-3.6
-      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -161,7 +163,7 @@ matrix:

    - os: linux
      compiler: clang++-3.7
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -172,7 +174,7 @@ matrix:

    - os: linux
      compiler: clang++-3.8
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -184,7 +186,7 @@ matrix:

    - os: linux
      compiler: clang++-3.9
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -196,7 +198,7 @@ matrix:

    - os: linux
      compiler: clang++-4.0
-      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -207,7 +209,7 @@ matrix:

    - os: linux
      compiler: clang++-5.0
-      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=11,14,1z
      addons:
        apt:
          packages:
@@ -218,7 +220,7 @@ matrix:

    - os: linux
      compiler: clang++-6.0
-      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17,2a
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=11,14,17,2a
      addons:
        apt:
          packages:
@@ -229,7 +231,7 @@ matrix:

    - os: linux
      compiler: clang++-7
-      env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,17,2a
+      env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=11,14,17,2a
      addons:
        apt:
          packages:
@@ -238,9 +240,20 @@ matrix:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-trusty-7

+    - os: linux
+      compiler: clang++-8
+      env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-8
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-8
+
    - os: linux
      compiler: clang++-libc++
-      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z VARIANT=release
+      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=11,14,1z VARIANT=release
      addons:
        apt:
          packages:
@@ -248,7 +261,7 @@ matrix:

    - os: osx
      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z

    - os: linux
      compiler: g++
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-# Copyright 2016, 2017 Peter Dimov
+# Copyright 2016-2019 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)

@@ -14,13 +14,31 @@ branches:

 environment:
  matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-14.0
+      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-12.0,msvc-14.0
+      ADDRESS_MODEL: 32,64
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
+      TOOLSET: msvc-14.1,clang-win
      CXXSTD: 14,17
+      ADDRESS_MODEL: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\cygwin\bin;
+      TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\cygwin64\bin;
+      TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\mingw\bin;
+      TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
+      TOOLSET: gcc
+      CXXSTD: 03,11,14,1z

 install:
  - set BOOST_BRANCH=develop
@@ -37,5 +55,7 @@ install:
 build: off

 test_script:
+  - PATH=%ADDPATH%%PATH%
  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
-  - b2 -j 3 libs/bind/test toolset=%TOOLSET% %CXXSTD%
+  - if not "%ADDRESS_MODEL%" == "" set ADDRESS_MODEL=address-model=%ADDRESS_MODEL%
+  - b2 -j3 libs/bind/test toolset=%TOOLSET% %CXXSTD% %ADDRESS_MODEL% variant=debug,release
--- a/doc/bind/troubleshooting.qbk
+++ b/doc/bind/troubleshooting.qbk
@@ -167,8 +167,8 @@ variable:
 [section Modeling STL function object concepts]

 The function objects that are produced by `bind` do not model the STL
-[@http://www.sgi.com/tech/stl/UnaryFunction.html /Unary Function/] or
-[@http://www.sgi.com/tech/stl/BinaryFunction.html /Binary Function/] concepts,
+[@https://boost.org/sgi/stl/UnaryFunction.html /Unary Function/] or
+[@https://boost.org/sgi/stl/BinaryFunction.html /Binary Function/] concepts,
 even when the function objects are unary or binary operations, because the
 function object types are missing public typedefs `result_type` and
 `argument_type` or `first_argument_type` and `second_argument_type`. In cases
--- a/doc/html/bind.html
+++ b/doc/html/bind.html
@@ -900,8 +900,8 @@
 </h3></div></div></div>
 <p>
        The function objects that are produced by <code class="computeroutput"><span class="identifier">bind</span></code>
-        do not model the STL <a href="http://www.sgi.com/tech/stl/UnaryFunction.html" target="_top"><span class="emphasis"><em>Unary
-        Function</em></span></a> or <a href="http://www.sgi.com/tech/stl/BinaryFunction.html" target="_top"><span class="emphasis"><em>Binary
+        do not model the STL <a href="https://boost.org/sgi/stl/UnaryFunction.html" target="_top"><span class="emphasis"><em>Unary
+        Function</em></span></a> or <a href="https://boost.org/sgi/stl/BinaryFunction.html" target="_top"><span class="emphasis"><em>Binary
        Function</em></span></a> concepts, even when the function objects are
        unary or binary operations, because the function object types are missing
        public typedefs <code class="computeroutput"><span class="identifier">result_type</span></code>
--- a/include/boost/bind/bind.hpp
+++ b/include/boost/bind/bind.hpp
@@ -21,6 +21,23 @@
 //  See http://www.boost.org/libs/bind/bind.html for documentation.
 //

+#if 1
+
+#include <boost/ref.hpp>
+#include <boost/mem_fn.hpp>
+#include <functional>
+
+namespace boost
+{
+
+using std::bind;
+
+namespace placeholders = std::placeholders;
+
+} // namespace boost
+
+#else
+
 #include <boost/config.hpp>
 #include <boost/ref.hpp>
 #include <boost/mem_fn.hpp>
@@ -2136,7 +2153,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #undef BOOST_BIND_ST
 #undef BOOST_BIND_NOEXCEPT

-#ifdef BOOST_BIND_ENABLE_STDCALL
+#if defined(BOOST_BIND_ENABLE_STDCALL) && !defined(_M_X64)

 #define BOOST_BIND_CC __stdcall
 #define BOOST_BIND_ST
@@ -2150,7 +2167,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl

 #endif

-#ifdef BOOST_BIND_ENABLE_FASTCALL
+#if defined(BOOST_BIND_ENABLE_FASTCALL) && !defined(_M_X64)

 #define BOOST_BIND_CC __fastcall
 #define BOOST_BIND_ST
@@ -2197,7 +2214,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #undef BOOST_BIND_MF_CC
 #undef BOOST_BIND_MF_NOEXCEPT

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
+#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)

 #define BOOST_BIND_MF_NAME(X) X##_cdecl
 #define BOOST_BIND_MF_CC __cdecl
@@ -2212,7 +2229,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl

 #endif

-#ifdef BOOST_MEM_FN_ENABLE_STDCALL
+#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)

 #define BOOST_BIND_MF_NAME(X) X##_stdcall
 #define BOOST_BIND_MF_CC __stdcall
@@ -2227,7 +2244,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl

 #endif

-#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
+#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)

 #define BOOST_BIND_MF_NAME(X) X##_fastcall
 #define BOOST_BIND_MF_CC __fastcall
@@ -2362,4 +2379,6 @@ BOOST_BIND( M T::*f, A1 a1 )
 # pragma warning(pop)
 #endif

+#endif
+
 #endif // #ifndef BOOST_BIND_BIND_HPP_INCLUDED
--- a/include/boost/bind/mem_fn.hpp
+++ b/include/boost/bind/mem_fn.hpp
@@ -21,6 +21,19 @@
 //  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
 //

+#if 1
+
+#include <functional>
+
+namespace boost
+{
+
+using std::mem_fn;
+
+} // namespace boost
+
+#else
+
 #include <boost/config.hpp>
 #include <boost/get_pointer.hpp>
 #include <boost/detail/workaround.hpp>
@@ -49,7 +62,7 @@ template<class V> struct mf
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
+#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
 #define BOOST_MEM_FN_CC __cdecl
@@ -61,7 +74,7 @@ template<class V> struct mf

 #endif

-#ifdef BOOST_MEM_FN_ENABLE_STDCALL
+#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
 #define BOOST_MEM_FN_CC __stdcall
@@ -73,7 +86,7 @@ template<class V> struct mf

 #endif

-#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
+#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) inner_##X##_fastcall
 #define BOOST_MEM_FN_CC __fastcall
@@ -102,7 +115,7 @@ template<> struct mf<void>
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
+#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
 #define BOOST_MEM_FN_CC __cdecl
@@ -155,7 +168,7 @@ template<> struct mf<void>
 #undef BOOST_MEM_FN_NAME2
 #undef BOOST_MEM_FN_CC

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
+#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) X##_cdecl
 #define BOOST_MEM_FN_NAME2(X) inner_##X##_cdecl
@@ -217,7 +230,7 @@ namespace _mfi
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
+#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) X##_cdecl
 #define BOOST_MEM_FN_CC __cdecl
@@ -229,7 +242,7 @@ namespace _mfi

 #endif

-#ifdef BOOST_MEM_FN_ENABLE_STDCALL
+#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) X##_stdcall
 #define BOOST_MEM_FN_CC __stdcall
@@ -241,7 +254,7 @@ namespace _mfi

 #endif

-#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
+#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) X##_fastcall
 #define BOOST_MEM_FN_CC __fastcall
@@ -270,7 +283,7 @@ namespace _mfi
 #undef BOOST_MEM_FN_NAME
 #undef BOOST_MEM_FN_CC

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
+#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) X##_cdecl
 #define BOOST_MEM_FN_CC __cdecl
@@ -282,7 +295,7 @@ namespace _mfi

 #endif

-#ifdef BOOST_MEM_FN_ENABLE_STDCALL
+#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) X##_stdcall
 #define BOOST_MEM_FN_CC __stdcall
@@ -294,7 +307,7 @@ namespace _mfi

 #endif

-#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
+#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)

 #define BOOST_MEM_FN_NAME(X) X##_fastcall
 #define BOOST_MEM_FN_CC __fastcall
@@ -386,4 +399,6 @@ template<class R, class T> _mfi::dm<R, T> mem_fn(R T::*f)

 } // namespace boost

+#endif
+
 #endif // #ifndef BOOST_BIND_MEM_FN_HPP_INCLUDED
Author	SHA1	Message	Date
Peter Dimov	dab3578e44	Remove C++03 from Travis	2019-11-06 01:35:19 +02:00
Peter Dimov	bf17d15d3c	Use std::mem_fn, std::bind	2019-11-05 18:58:02 +02:00
Peter Dimov	d6ac20c4fd	Update .travis.yml	2019-06-18 12:43:31 +03:00
Peter Dimov	4c263bff9e	Merge pull request #17 from tinko92/develop Change broken sgi/stl links to boost.org.	2019-04-23 10:18:06 -07:00
Tinko Bartels	d051c452ea	Change broken sgi/stl links to boost.org.	2019-04-23 19:04:59 +02:00
Peter Dimov	b0f3b3fbab	Switch Appveyor to 2015 image	2019-04-14 18:32:29 +03:00
Peter Dimov	be7a2d9212	Use ADDPATH in appveyor.yml	2019-04-01 21:50:49 +03:00
Peter Dimov	c8973a7027	Ignore the calling convention macros in 64 bit	2019-04-01 21:42:40 +03:00
Peter Dimov	f52ef4b659	Add more Appveyor configurations	2019-04-01 21:21:04 +03:00