Compare commits

...

2 Commits

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
3 changed files with 59 additions and 35 deletions

View File

@@ -26,21 +26,11 @@ matrix:
include: include:
- os: linux - os: linux
compiler: g++ compiler: g++
env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++ CXXSTD=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
- os: linux - os: linux
compiler: g++-4.6 compiler: g++-4.6
env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=0x
addons: addons:
apt: apt:
packages: packages:
@@ -50,7 +40,7 @@ matrix:
- os: linux - os: linux
compiler: g++-4.7 compiler: g++-4.7
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=11
addons: addons:
apt: apt:
packages: packages:
@@ -60,7 +50,7 @@ matrix:
- os: linux - os: linux
compiler: g++-4.8 compiler: g++-4.8
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=11
addons: addons:
apt: apt:
packages: packages:
@@ -69,7 +59,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
compiler: g++-4.9 compiler: g++-4.9
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=11
addons: addons:
apt: apt:
packages: packages:
@@ -79,7 +69,7 @@ matrix:
- os: linux - os: linux
compiler: g++-5 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: addons:
apt: apt:
packages: packages:
@@ -89,7 +79,7 @@ matrix:
- os: linux - os: linux
compiler: g++-6 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: addons:
apt: apt:
packages: packages:
@@ -100,7 +90,7 @@ matrix:
- os: linux - os: linux
dist: trusty dist: trusty
compiler: g++-7 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: addons:
apt: apt:
packages: packages:
@@ -110,7 +100,7 @@ matrix:
- os: linux - os: linux
compiler: g++-8 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: addons:
apt: apt:
packages: packages:
@@ -120,7 +110,7 @@ matrix:
- os: linux - os: linux
compiler: g++-9 compiler: g++-9
env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=11,14,17,2a
addons: addons:
apt: apt:
packages: packages:
@@ -130,11 +120,11 @@ matrix:
- os: linux - os: linux
compiler: clang++ compiler: clang++
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11 env: TOOLSET=clang COMPILER=clang++ CXXSTD=11
- os: linux - os: linux
compiler: /usr/bin/clang++ compiler: /usr/bin/clang++
env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11 env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=11
addons: addons:
apt: apt:
packages: packages:
@@ -142,7 +132,7 @@ matrix:
- os: linux - os: linux
compiler: /usr/bin/clang++ compiler: /usr/bin/clang++
env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11 env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=11
addons: addons:
apt: apt:
packages: packages:
@@ -150,7 +140,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.5 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: addons:
apt: apt:
packages: packages:
@@ -162,7 +152,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.6 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: addons:
apt: apt:
packages: packages:
@@ -173,7 +163,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.7 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: addons:
apt: apt:
packages: packages:
@@ -184,7 +174,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.8 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: addons:
apt: apt:
packages: packages:
@@ -196,7 +186,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.9 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: addons:
apt: apt:
packages: packages:
@@ -208,7 +198,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-4.0 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: addons:
apt: apt:
packages: packages:
@@ -219,7 +209,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-5.0 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: addons:
apt: apt:
packages: packages:
@@ -230,7 +220,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-6.0 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: addons:
apt: apt:
packages: packages:
@@ -241,7 +231,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-7 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: addons:
apt: apt:
packages: packages:
@@ -252,7 +242,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-8 compiler: clang++-8
env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=11,14,17,2a
addons: addons:
apt: apt:
packages: packages:
@@ -263,7 +253,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-libc++ 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: addons:
apt: apt:
packages: packages:
@@ -271,7 +261,7 @@ matrix:
- os: osx - os: osx
compiler: clang++ compiler: clang++
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z
- os: linux - os: linux
compiler: g++ compiler: g++

View File

@@ -21,6 +21,23 @@
// See http://www.boost.org/libs/bind/bind.html for documentation. // 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/config.hpp>
#include <boost/ref.hpp> #include <boost/ref.hpp>
#include <boost/mem_fn.hpp> #include <boost/mem_fn.hpp>
@@ -2362,4 +2379,6 @@ BOOST_BIND( M T::*f, A1 a1 )
# pragma warning(pop) # pragma warning(pop)
#endif #endif
#endif
#endif // #ifndef BOOST_BIND_BIND_HPP_INCLUDED #endif // #ifndef BOOST_BIND_BIND_HPP_INCLUDED

View File

@@ -21,6 +21,19 @@
// See http://www.boost.org/libs/bind/mem_fn.html for documentation. // 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/config.hpp>
#include <boost/get_pointer.hpp> #include <boost/get_pointer.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
@@ -386,4 +399,6 @@ template<class R, class T> _mfi::dm<R, T> mem_fn(R T::*f)
} // namespace boost } // namespace boost
#endif
#endif // #ifndef BOOST_BIND_MEM_FN_HPP_INCLUDED #endif // #ifndef BOOST_BIND_MEM_FN_HPP_INCLUDED