Merge pull request #88 from Flamefire/c++11

Port to C++11/C++14 removing superflous Boost facilities

.github/workflows/ci.yml

@@ -0,0 +1,160 @@
+# Copyright 2022 Alexander Grund
+#
+# 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)
+
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+      - feature/**
+
+concurrency:
+  group: ${{format('{0}:{1}', github.repository, github.ref)}}
+  cancel-in-progress: true
+
+env:
+  NET_RETRY_COUNT: 5
+  DOCBOOK_XSL_DIR: /usr/share/xml/docbook/stylesheet/docbook-xsl
+  DOCBOOK_DTD_DIR: /usr/share/xml/docbook/schema/dtd/4.2
+
+jobs:
+  posix:
+    defaults:
+      run:
+        shell: bash
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Linux, gcc
+          - { compiler: gcc-5, cxxstd: '14',       boostBranch: boost-1.65.0, os: ubuntu-18.04 }
+          - { compiler: gcc-5, cxxstd: '14',       boostBranch: boost-1.77.0, os: ubuntu-18.04 }
+          - { compiler: gcc-5, cxxstd: '14,1z',    boostBranch: master,       os: ubuntu-18.04 }
+          - { compiler: gcc-11,cxxstd: '14,17,20', boostBranch: master,       os: ubuntu-20.04 }
+
+          # Linux, clang
+          - { compiler: clang-5.0, cxxstd: '14',       boostBranch: boost-1.65.0, os: ubuntu-18.04 }
+          - { compiler: clang-5.0, cxxstd: '14',       boostBranch: boost-1.77.0, os: ubuntu-18.04 }
+          - { compiler: clang-5.0, cxxstd: '14,1z',    boostBranch: master,       os: ubuntu-18.04 }
+          - { compiler: clang-12,  cxxstd: '14,17,20', boostBranch: master,       os: ubuntu-20.04 }
+
+          - { name: Collect coverage, coverage: yes,
+              compiler: gcc-8,     cxxstd: '14',       boostBranch: master,       os: ubuntu-20.04 }
+
+    timeout-minutes: 120
+    runs-on: ${{matrix.os}}
+    env:
+      BOOST_ROOT: ${{github.workspace}}/boost-root
+      PROJECT_DIR: ${{github.workspace}}/repo
+
+    steps:
+      - uses: actions/checkout@v2
+        if: '!matrix.coverage'
+        with:
+          path: ${{env.PROJECT_DIR}}
+      - uses: actions/checkout@v2
+        if: 'matrix.coverage'
+        with:
+          path: ${{env.PROJECT_DIR}}
+          fetch-depth: 0
+      # Checking out Boost and all its submodules takes ages...
+      - name: Cache Boost
+        uses: actions/cache@v2
+        with:
+          path: boost-root
+          key: boost-${{matrix.boostBranch}}
+      - name: Checkout Boost
+        uses: actions/checkout@v2
+        with:
+          repository: boostorg/boost
+          ref: ${{matrix.boostBranch}}
+          submodules: true
+          path: boost-root
+          persist-credentials: false
+
+      - name: Install packages and setup env
+        run: |
+            sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
+            CXX=${{matrix.compiler}}
+            CXX="${CXX/gcc-/g++-}"
+            # Package names are g++-* and clang-*, so set this before correcting CXX for Clang
+            pkgs="$CXX xsltproc docbook-xsl docbook-xml lcov ccache"
+            sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y $pkgs
+            CXX="ccache ${CXX/clang-/clang++-}"
+            echo "CXX=$CXX" >> $GITHUB_ENV
+            echo "CC=${{matrix.compiler}}" >> $GITHUB_ENV
+            if [[ "$CXX" =~ clang ]]; then
+              B2_TOOLSET=clang
+            else
+              B2_TOOLSET=gcc
+            fi
+            echo "B2_TOOLSET=$B2_TOOLSET" >> $GITHUB_ENV
+            echo "using $B2_TOOLSET : : $CXX ;" > ~/user-config.jam
+
+      - name: Cache ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ${{matrix.os}}-${{matrix.compiler}}-${{matrix.boostBranch}}
+
+      - name: Prepare boost
+        working-directory: boost-root
+        run: ./bootstrap.sh && ./b2 headers
+
+      - name: Boost build
+        working-directory: ${{env.PROJECT_DIR}}
+        run: |
+          if [[ "${{matrix.boostBranch}}" == "master" ]]; then
+            B2_FLAGS="cxxstd=${{matrix.cxxstd}}"
+          else
+            B2_FLAGS="cxxflags=-std=c++${{matrix.cxxstd}}"
+          fi
+          if [[ "${{matrix.coverage}}" == "yes" ]]; then
+            B2_FLAGS="$B2_FLAGS cxxflags=--coverage linkflags=--coverage"
+          fi
+          scripts/build.sh --toolset=$B2_TOOLSET $B2_FLAGS -j3
+
+      - name: Collect coverage
+        if: matrix.coverage
+        working-directory: ${{env.PROJECT_DIR}}
+        run: |
+          lcov --version
+          lcov --gcov-tool=gcov-8 --directory "$PROJECT_DIR/test" --base-directory "$BOOST_ROOT" --capture --output-file all.info
+          # dump a summary on the console
+          lcov --list all.info
+          # Limit to our files (header-only in this case)
+          lcov --extract all.info "$PROJECT_DIR/include/*" --output-file coverage.info
+          # Output what was collected
+          lcov --list coverage.info
+      - name: Upload coverage
+        if: matrix.coverage
+        uses: coverallsapp/github-action@master
+        with:
+          path-to-lcov: ${{env.PROJECT_DIR}}/coverage.info
+          github-token: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Build required boost libs
+        working-directory: boost-root
+        run: |
+          ./b2 --toolset=$B2_TOOLSET --with-test --with-thread --with-chrono --with-system --with-atomic --with-date_time -a -j3
+          # Add lib folder to LD_LIBRARY_PATH, so the tests can load them
+          echo "LD_LIBRARY_PATH=$PWD/stage/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+
+      - name: CMake build
+        working-directory: ${{env.PROJECT_DIR}}
+        run: |
+          mkdir build && cd build
+          CXX_STANDARD="${{matrix.cxxstd}}"
+          cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-std=c++${CXX_STANDARD##*,}" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_VERBOSE_MAKEFILE=ON
+          cmake --build . --config Debug -- -j3
+          ctest --output-on-failure --build-config Debug -j3
+
+      - name: Cleanup Boost folder
+        if: ${{ always() }}
+        working-directory: boost-root
+        run: git clean -fxd

CMakeLists.txt

@@ -13,7 +13,6 @@ else()
 endif()
 
 option(TURTLE_INSTALL "Enable to add install target" ${IS_ROOT_PROJECT})
-option(TURTLE_AUTO_PTR "Enable support for auto_ptr" OFF)
 
 # Default boost libs are static on windows and dynamic on linux
 if(WIN32 AND NOT DEFINED Boost_USE_STATIC_LIBS)
@@ -27,10 +26,9 @@ configure_file(version.hpp.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/turtle/vers
 add_library(turtle INTERFACE)
 add_library(turtle::turtle ALIAS turtle)
 target_include_directories(turtle INTERFACE $<BUILD_INTERFACE:include;${CMAKE_CURRENT_BINARY_DIR}/include>)
+target_compile_features(turtle INTERFACE cxx_std_14)
+
 target_link_libraries(turtle INTERFACE Boost::boost Boost::disable_autolinking)
-if(NOT TURTLE_AUTO_PTR)
-  target_compile_definitions(turtle INTERFACE MOCK_NO_AUTO_PTR)
-endif()
 
 if(BUILD_TESTING)
   add_subdirectory(test)

appveyor.yml

@@ -14,7 +14,7 @@ branches:
 environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      BOOST: 1_60_0
+      BOOST: 1_65_1
       TOOLSET: msvc-14.0
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       BOOST: 1_65_1
@@ -26,10 +26,10 @@ environment:
       CXX_STANDARD: 14
       # CXX_STANDARD: 17
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      BOOST: 1_60_0
+      BOOST: 1_65_1
       CMAKE: true
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      BOOST: 1_71_0
+      BOOST: 1_77_0
       CMAKE: true
 
 install:

doc/changelog.qbk

@@ -11,6 +11,9 @@
 Released -
 
 * Allow auto-deducing signature in `MOCK_METHOD_(NON_)CONST`
+* Replaced Boost facilities with std:: equivalents where existing in C++14
+* Deprecated MOCK_FUNCTOR_TPL as no longer required, use the non _TPL variant even for templates
+* Added MOCK_PROTECT_FUNCTION_SIG to pass function signatures with commas in the return type
 
 [endsect]
 

doc/customization.qbk

@@ -98,7 +98,7 @@ The purpose of the 'near' template function is to :
 * remove the burden of specifying the template parameter when instantiating near_constraint
 * wrap the constraint in a mock::constraint so that it plays nicely with !, && and ||.
 
-The use of boost::unwrap_ref provides support for passing arguments as references with boost::ref and boost::cref and delaying their initialization, for instance :
+The use of mock::unwrap_ref provides support for passing arguments as references with std::ref and std::cref and delaying their initialization, for instance :
 
 [near_constraint_cref_test]
 

doc/example/calculator.hpp

@@ -9,15 +9,16 @@
 #ifndef CALCULATOR
 #define CALCULATOR
 
-class view;
+#include "view.hpp"
 
 //[ calculator
 class calculator
 {
+    view& v;
 public:
-    calculator( view& v );
+    calculator( view& v ): v(v){}
 
-    void add( int a, int b ); // the result will be sent to the view 'v'
+    void add( int a, int b ){ v.display(a + b); } // the result will be sent to the view 'v'
 };
 //]