Merge pull request #209 from Morwenn/develop

Release 1.13.1

Author: Morwenn

.github/workflows/build-macos.yml

@@ -23,14 +23,14 @@ on:
 
 jobs:
   build:
-    runs-on: macos-10.15
+    runs-on: macos-11
 
     strategy:
       fail-fast: false
       matrix:
         cxx:
-          - g++-9
-          - $(brew --prefix llvm)/bin/clang++  # Clang 11
+          - g++-10
+          - clang++
         config:
           # Release build
           - build_type: Release
@@ -41,8 +41,7 @@ jobs:
             sanitize: undefined
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: seanmiddleditch/gha-setup-ninja@master
+      - uses: actions/checkout@v3
 
       - name: Configure CMake
         working-directory: ${{runner.workspace}}
@@ -52,7 +51,6 @@ jobs:
                 -DCMAKE_CONFIGURATION_TYPES=${{matrix.config.build_type}} \
                 -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} \
                 -DCPPSORT_SANITIZE=${{matrix.config.sanitize}} \
-                -GNinja \
                 -DCPPSORT_BUILD_EXAMPLES=ON
 
       - name: Build the test suite

.github/workflows/build-mingw.yml

@@ -31,7 +31,7 @@ jobs:
         build_type: [Debug, Release]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Configure CMake
         shell: pwsh

.github/workflows/build-msvc.yml

@@ -31,7 +31,7 @@ jobs:
         build_type: [Debug, Release]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Configure CMake
         shell: pwsh

.github/workflows/build-ubuntu.yml

@@ -43,7 +43,7 @@ jobs:
             sanitize: undefined
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install GCC
         if: ${{matrix.cxx == 'g++-5'}}

.github/workflows/code-coverage.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install LCOV
         run: sudo apt-get install -y lcov

.github/workflows/deploy-to-wiki.yml

@@ -18,13 +18,13 @@ jobs:
 
     steps:
       - name: Checkout /docs
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{github.repository}}
           path: main
 
       - name: Checkout wiki
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{github.repository}}.wiki
           path: wiki

.gitignore

@@ -1,8 +1,8 @@
-# Copyright (c) 2015-2021 Morwenn
+# Copyright (c) 2015-2022 Morwenn
 # SPDX-License-Identifier: MIT
 
 # Usual build directory
-build
+build*
 
 # Benchmark results directories
 results

CMakeLists.txt

@@ -1,11 +1,11 @@
-# Copyright (c) 2015-2021 Morwenn
+# Copyright (c) 2015-2022 Morwenn
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.8.0)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-project(cpp-sort VERSION 1.13.0 LANGUAGES CXX)
+project(cpp-sort VERSION 1.13.1 LANGUAGES CXX)
 
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)

README.md

@@ -1,7 +1,7 @@
 ![cpp-sort logo](docs/images/cpp-sort-logo.svg)
 
-[![Latest Release](https://img.shields.io/badge/release-1.13.0-blue.svg)](https://github.com/Morwenn/cpp-sort/releases/tag/1.13.0)
-[![Conan Package](https://img.shields.io/badge/conan-cpp--sort%2F1.13.0-blue.svg)](https://conan.io/center/cpp-sort?version=1.13.0)
+[![Latest Release](https://img.shields.io/badge/release-1.13.1-blue.svg)](https://github.com/Morwenn/cpp-sort/releases/tag/1.13.1)
+[![Conan Package](https://img.shields.io/badge/conan-cpp--sort%2F1.13.1-blue.svg)](https://conan.io/center/cpp-sort?version=1.13.1)
 [![Code Coverage](https://codecov.io/gh/Morwenn/cpp-sort/branch/develop/graph/badge.svg)](https://codecov.io/gh/Morwenn/cpp-sort)
 [![Pitchfork Layout](https://img.shields.io/badge/standard-PFL-orange.svg)](https://github.com/vector-of-bool/pitchfork)
 

benchmarks/benchmarking-tools/distributions.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2021 Morwenn
+ * Copyright (c) 2015-2022 Morwenn
  * SPDX-License-Identifier: MIT
  */
 #include <algorithm>
@@ -13,6 +13,7 @@
 #include <cpp-sort/detail/type_traits.h>
 #include <cpp-sort/utility/as_function.h>
 #include <cpp-sort/utility/functional.h>
+#include <cpp-sort/utility/functional.h>
 
 // Pseudo-random number generator, used by some distributions
 thread_local std::mt19937_64 distributions_prng(std::time(nullptr));
@@ -400,9 +401,10 @@ namespace dist
         static constexpr const char* output = "vergesort_killer.txt";
     };
 
-    struct as_long_string
+    struct as_long_string:
+        cppsort::utility::projection_base
     {
-        auto operator()(long long int value)
+        auto operator()(long long int value) const
             -> std::string
         {
             auto str = std::to_string(value);