Trim trailing spaces.

Copy boost::timer to tests since the original is deprecated and giving errors.
We're not using Boost.Timer v2 components to avoid linking tests with its separately compiled binary. The legacy boost::timer is fine for the test purposes.
2026-01-21 17:12:16 +00:00 · 2023-06-05 16:06:33 +03:00 · 2023-06-05 16:03:18 +03:00 · 2023-06-05 03:21:51 +03:00 · 2022-10-18 17:58:37 +03:00 · 2022-09-10 01:45:30 +03:00
17 changed files with 184 additions and 73 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 Andrey Semashev
+# Copyright 2021-2022 Andrey Semashev
 #
 # 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)
@@ -35,7 +35,7 @@ jobs:
          # Linux, gcc
          - toolset: gcc-4.4
            cxxstd: "98,0x"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - g++-4.4
@@ -43,7 +43,7 @@ jobs:
              - "ppa:ubuntu-toolchain-r/test"
          - toolset: gcc-4.6
            cxxstd: "03,0x"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - g++-4.6
@@ -51,45 +51,49 @@ jobs:
              - "ppa:ubuntu-toolchain-r/test"
          - toolset: gcc-4.7
            cxxstd: "03,11"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - g++-4.7
          - toolset: gcc-4.8
            cxxstd: "03,11"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - g++-4.8
          - toolset: gcc-4.9
            cxxstd: "03,11"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - g++-4.9
          - toolset: gcc-5
            cxxstd: "03,11,14,1z"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - g++-5
          - toolset: gcc-6
            cxxstd: "03,11,14,1z"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - g++-6
          - toolset: gcc-7
            cxxstd: "03,11,14,17"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - g++-7
          - toolset: gcc-8
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - g++-8
          - toolset: gcc-9
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
+            os: ubuntu-20.04
            install:
              - g++-9
          - toolset: gcc-10
@@ -98,87 +102,94 @@ jobs:
            install:
              - g++-10
          - toolset: gcc-11
-            cxxstd: "03,11,14,17,20"
-            os: ubuntu-20.04
+            cxxstd: "03,11,14,17,20,23"
+            os: ubuntu-22.04
            install:
              - g++-11
-            sources:
-              - "ppa:ubuntu-toolchain-r/test"
+          - toolset: gcc-12
+            cxxstd: "03,11,14,17,20,23"
+            os: ubuntu-22.04
+            install:
+              - g++-12
          - name: UBSAN
            toolset: gcc-11
-            cxxstd: "03,11,14,17,20"
+            cxxstd: "03,11,14,17,20,23"
            ubsan: 1
            build_variant: debug
-            os: ubuntu-20.04
+            os: ubuntu-22.04
            install:
              - g++-11
-            sources:
-              - "ppa:ubuntu-toolchain-r/test"

          # Linux, clang
          - toolset: clang
            compiler: clang++-3.5
            cxxstd: "03,11"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - clang-3.5
          - toolset: clang
            compiler: clang++-3.6
            cxxstd: "03,11,14"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - clang-3.6
          - toolset: clang
            compiler: clang++-3.7
            cxxstd: "03,11,14"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - clang-3.7
          - toolset: clang
            compiler: clang++-3.8
            cxxstd: "03,11,14"
-            os: ubuntu-20.04
+            os: ubuntu-latest
            container: ubuntu:16.04
            install:
              - clang-3.8
          - toolset: clang
            compiler: clang++-3.9
            cxxstd: "03,11,14"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - clang-3.9
          - toolset: clang
            compiler: clang++-4.0
            cxxstd: "03,11,14"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - clang-4.0
          - toolset: clang
            compiler: clang++-5.0
            cxxstd: "03,11,14,1z"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - clang-5.0
          - toolset: clang
            compiler: clang++-6.0
            cxxstd: "03,11,14,17"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - clang-6.0
          - toolset: clang
            compiler: clang++-7
            cxxstd: "03,11,14,17"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - clang-7
          # Note: clang-8 does not fully support C++20, so it is not compatible with libstdc++-8 in this mode
          - toolset: clang
            compiler: clang++-8
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install:
              - clang-8
              - g++-7
@@ -198,42 +209,74 @@ jobs:
          - toolset: clang
            compiler: clang++-11
            cxxstd: "03,11,14,17,20"
-            os: ubuntu-20.04
+            os: ubuntu-22.04
            install:
              - clang-11
          - toolset: clang
            compiler: clang++-12
-            cxxstd: "03,11,14,17,20"
-            os: ubuntu-20.04
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
            install:
              - clang-12
          - toolset: clang
-            compiler: clang++-12
-            cxxstd: "03,11,14,17,20"
-            os: ubuntu-20.04
+            compiler: clang++-13
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
            install:
-              - clang-12
-              - libc++-12-dev
-              - libc++abi-12-dev
+              - clang-13
+          - toolset: clang
+            compiler: clang++-14
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
+            install:
+              - clang-14
+          - toolset: clang
+            compiler: clang++-15
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
+            install:
+              - clang-15
+          - toolset: clang
+            compiler: clang++-16
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
+            install:
+              - clang-16
+            sources:
+              - "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
+            source_keys:
+              - "https://apt.llvm.org/llvm-snapshot.gpg.key"
+          - toolset: clang
+            compiler: clang++-16
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
+            install:
+              - clang-16
+              - libc++-16-dev
+              - libc++abi-16-dev
+            sources:
+              - "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
+            source_keys:
+              - "https://apt.llvm.org/llvm-snapshot.gpg.key"
            cxxflags: -stdlib=libc++
            linkflags: -stdlib=libc++
          - name: UBSAN
            toolset: clang
-            compiler: clang++-12
-            cxxstd: "03,11,14,17,20"
+            compiler: clang++-15
+            cxxstd: "03,11,14,17,20,2b"
            cxxflags: -stdlib=libc++
            linkflags: -stdlib=libc++
            ubsan: 1
            build_variant: debug
-            os: ubuntu-20.04
+            os: ubuntu-22.04
            install:
-              - clang-12
-              - libc++-12-dev
-              - libc++abi-12-dev
+              - clang-15
+              - libc++-15-dev
+              - libc++abi-15-dev

          - toolset: clang
            cxxstd: "03,11,14,17,2a"
-            os: macos-10.15
+            os: macos-11

    timeout-minutes: 60
    runs-on: ${{matrix.os}}
@@ -253,12 +296,18 @@ jobs:
                if [ -f "/etc/debian_version" ]
                then
                    apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
-                    apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common tzdata wget curl apt-transport-https ca-certificates make build-essential g++ python python3 perl git cmake
+                    if [ "$(apt-cache search "^python-is-python3$" | wc -l)" -ne 0 ]
+                    then
+                        PYTHON_PACKAGE="python-is-python3"
+                    else
+                        PYTHON_PACKAGE="python"
+                    fi
+                    apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common tzdata wget curl apt-transport-https ca-certificates make build-essential g++ $PYTHON_PACKAGE python3 perl git cmake
                fi
            fi
            git config --global pack.threads 0

-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3

      - name: Install packages
        if: matrix.install
--- a/include/boost/parameter/aux_/pack/tag_keyword_arg_ref.hpp
+++ b/include/boost/parameter/aux_/pack/tag_keyword_arg_ref.hpp
@@ -10,7 +10,7 @@
 #include <boost/parameter/aux_/tagged_argument.hpp>
 #include <boost/parameter/config.hpp>

-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {

    template <
        typename Keyword
@@ -34,7 +34,7 @@ namespace boost { namespace parameter { namespace aux {

 #include <boost/mpl/bool.hpp>

-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {

    template <typename Keyword, typename ActualArg>
    struct tag_ref<Keyword,ActualArg,::boost::mpl::false_>
--- a/include/boost/parameter/aux_/pack/unmatched_argument.hpp
+++ b/include/boost/parameter/aux_/pack/unmatched_argument.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace parameter { namespace aux {
        ));
 #endif
        typedef int type;
-    }; 
+    };
 }}} // namespace boost::parameter::aux

 #endif  // include guard
--- a/include/boost/parameter/aux_/preprocessor/overloads.hpp
+++ b/include/boost/parameter/aux_/preprocessor/overloads.hpp
@@ -51,7 +51,7 @@
    ::boost::parameter::aux::item< \
        BOOST_PP_CAT(PS, n), BOOST_PP_CAT(A, n)

-#define BOOST_PARAMETER_close_list(z, n, text) > 
+#define BOOST_PARAMETER_close_list(z, n, text) >

 #define BOOST_PARAMETER_arg_list(n) \
    ::boost::parameter::aux::make_arg_list< \
--- a/include/boost/parameter/aux_/tag.hpp
+++ b/include/boost/parameter/aux_/tag.hpp
@@ -19,7 +19,7 @@
 #include <boost/mp11/utility.hpp>
 #include <type_traits>

-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {

    template <typename Keyword, typename Arg>
    struct tag_if_lvalue_reference
@@ -75,7 +75,7 @@ namespace boost { namespace parameter { namespace aux {
 #include <boost/type_traits/is_lvalue_reference.hpp>
 #include <boost/type_traits/remove_const.hpp>

-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {

    template <typename Keyword, typename ActualArg>
    struct tag
@@ -119,7 +119,7 @@ namespace boost { namespace parameter { namespace aux {

 #else   // !defined(BOOST_PARAMETER_HAS_PERFECT_FORWARDING)

-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {

    template <
        typename Keyword
@@ -142,7 +142,7 @@ namespace boost { namespace parameter { namespace aux {
 #include <boost/mpl/bool.hpp>
 #include <boost/type_traits/remove_reference.hpp>

-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {

    template <typename Keyword, typename Arg>
    struct tag<Keyword,Arg,::boost::mpl::false_>
--- a/include/boost/parameter/aux_/unwrap_cv_reference.hpp
+++ b/include/boost/parameter/aux_/unwrap_cv_reference.hpp
@@ -121,7 +121,7 @@ namespace boost { namespace parameter { namespace aux {
        typedef boost::mpl::bool_<
 #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
            is_cv_reference_wrapper::
-#endif 
+#endif
        value> type;
    };

--- a/include/boost/parameter/aux_/void.hpp
+++ b/include/boost/parameter/aux_/void.hpp
@@ -6,7 +6,7 @@
 #ifndef BOOST_PARAMETER_VOID_050329_HPP
 #define BOOST_PARAMETER_VOID_050329_HPP

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

    // A placemarker for "no argument passed."
    // MAINTAINER NOTE: Do not make this into a metafunction
--- a/include/boost/parameter/binding.hpp
+++ b/include/boost/parameter/binding.hpp
@@ -24,7 +24,7 @@
 #include <boost/type_traits/is_same.hpp>
 #endif

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

    // A metafunction that, given an argument pack, returns the reference type
    // of the parameter identified by the given keyword.  If no such parameter
@@ -100,7 +100,7 @@ namespace boost { namespace parameter {

 #include <boost/parameter/aux_/is_placeholder.hpp>

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

    template <
        typename Parameters
@@ -132,7 +132,7 @@ namespace boost { namespace parameter {

 #include <boost/parameter/aux_/result_of0.hpp>

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

    // A metafunction that, given an argument pack, returns the reference type
    // of the parameter identified by the given keyword.  If no such parameter
--- a/include/boost/parameter/match.hpp
+++ b/include/boost/parameter/match.hpp
@@ -26,7 +26,7 @@
 /**/
 #else
 #define BOOST_PARAMETER_MATCH_DEFAULTS(ArgTypes)
-#endif 
+#endif

 #include <boost/parameter/aux_/preprocessor/seq_enum.hpp>

--- a/include/boost/parameter/template_keyword.hpp
+++ b/include/boost/parameter/template_keyword.hpp
@@ -24,7 +24,7 @@
 #include <boost/type_traits/is_array.hpp>
 #endif

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

    template <typename Tag, typename T>
    struct template_keyword : ::boost::parameter::aux::template_keyword_base
--- a/include/boost/parameter/value_type.hpp
+++ b/include/boost/parameter/value_type.hpp
@@ -24,7 +24,7 @@
 #include <boost/type_traits/is_same.hpp>
 #endif

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

    // A metafunction that, given an argument pack, returns the value type
    // of the parameter identified by the given keyword.  If no such parameter
@@ -100,7 +100,7 @@ namespace boost { namespace parameter {

 #include <boost/parameter/aux_/is_placeholder.hpp>

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

    template <
        typename Parameters
@@ -132,7 +132,7 @@ namespace boost { namespace parameter {

 #include <boost/parameter/aux_/result_of0.hpp>

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

    // A metafunction that, given an argument pack, returns the value type
    // of the parameter identified by the given keyword.  If no such parameter
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,6 +5,8 @@
 # NOTE: CMake support for Boost.Parameter is currently experimental at best
 #       and the interface is likely to change in the future

+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
 # TODO: Also process literate tests
 file(GLOB test_files *.cpp)

--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -13,6 +13,7 @@ project boost/parameter
    :
        default-build
        <warnings>off
+        <include>.
    ;

 alias parameter_standard_tests
--- a/test/earwicker.cpp
+++ b/test/earwicker.cpp
@@ -91,14 +91,14 @@ namespace test {
    BOOST_PARAMETER_FUN(int, f, 1, 4, f_parameters)
 #else
    BOOST_PARAMETER_FUN(void, f, 1, 4, f_parameters)
-#endif 
+#endif
    {
        BOOST_TEST_EQ(p[test::_w][0], p[test::_x | -1]);
        BOOST_TEST_EQ(p[test::_w][1], p[test::_y | -2]);
        BOOST_TEST_EQ(p[test::_w][2], p[test::_z | -3]);
 #if defined(BOOST_NO_VOID_RETURNS)
        return 0;
-#endif 
+#endif
    }
 } // namespace test

--- a/test/efficiency.cpp
+++ b/test/efficiency.cpp
@@ -5,8 +5,8 @@

 #include <boost/parameter/name.hpp>
 #include <boost/config/workaround.hpp>
-#include <boost/timer.hpp>
 #include <iostream>
+#include "timer.hpp"

 namespace test {

@@ -40,7 +40,7 @@ namespace test {
    //      or other processes and even device hardware interrupts may
    //      interfere by causing caches to be flushed.

-    // Accumulator function object with plain C++ interface 
+    // Accumulator function object with plain C++ interface
    template <typename T>
    struct plain_weight_running_total
    {
@@ -147,7 +147,7 @@ namespace test {
        test::hammer<Accumulator>(x, repeats);

        // Now start a timer.
-        boost::timer time;
+        test::timer time;
        test::hammer<Accumulator>(x, repeats);  // This time, we'll measure.
        return time.elapsed();
    }
@@ -163,7 +163,7 @@ int main()
    {
        repeats *= 10;

-        boost::timer time;
+        test::timer time;

        test::hammer<test::plain_weight_running_total<double> >(.1, repeats);
        test::hammer<test::named_param_weight_running_total<double> >(
@@ -172,7 +172,7 @@ int main()

        measured = time.elapsed();
    }
-    
+
    std::cout
        << "plain time:           "
        << test::measure<test::plain_weight_running_total<double> >(
--- a/test/preprocessor_deduced.cpp
+++ b/test/preprocessor_deduced.cpp
@@ -99,7 +99,7 @@ namespace test {
        return 1;
    }

-    struct X 
+    struct X
    {
        X(int x_ = -1) : x(x_)
        {
--- a/test/timer.hpp
+++ b/test/timer.hpp
@@ -0,0 +1,59 @@
+//  Copyright Andrey Semashev 2023.
+//
+//  Distributed under the Boost Software License, Version 1.0.
+//  (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+//  This file is a copy of boost/timer.hpp from Boost.Timer v1, which
+//  was deprecated and slated for removal. We are not using Boost.Timer v2
+//  components to avoid having to link with its binary.
+//
+//  See http://www.boost.org/libs/timer for documentation.
+
+#ifndef BOOST_PARAMETER_TEST_TIMER_HPP
+#define BOOST_PARAMETER_TEST_TIMER_HPP
+
+#include <ctime>
+#include <limits>
+
+namespace test {
+
+//  timer  -------------------------------------------------------------------//
+
+//  A timer object measures elapsed time.
+
+//  It is recommended that implementations measure wall clock rather than CPU
+//  time since the intended use is performance measurement on systems where
+//  total elapsed time is more important than just process or CPU time.
+
+//  Warnings: The maximum measurable elapsed time may well be only 596.5+ hours
+//  due to implementation limitations.  The accuracy of timings depends on the
+//  accuracy of timing information provided by the underlying platform, and
+//  this varies a great deal from platform to platform.
+
+class timer
+{
+ public:
+  timer() { _start_time = std::clock(); } // postcondition: elapsed()==0
+  void restart() { _start_time = std::clock(); } // post: elapsed()==0
+  double elapsed() const                  // return elapsed time in seconds
+    { return  double(std::clock() - _start_time) / CLOCKS_PER_SEC; }
+
+  double elapsed_max() const   // return estimated maximum value for elapsed()
+  // Portability warning: elapsed_max() may return too high a value on systems
+  // where std::clock_t overflows or resets at surprising values.
+  {
+    return (double((std::numeric_limits<std::clock_t>::max)())
+       - double(_start_time)) / double(CLOCKS_PER_SEC);
+  }
+
+  double elapsed_min() const            // return minimum value for elapsed()
+   { return double(1)/double(CLOCKS_PER_SEC); }
+
+ private:
+  std::clock_t _start_time;
+}; // timer
+
+} // namespace test
+
+#endif  // BOOST_PARAMETER_TEST_TIMER_HPP
Author	SHA1	Message	Date
Andrey Semashev	6538609cf5	Trim trailing spaces.	2023-06-05 16:06:33 +03:00
Andrey Semashev	02e1c566f7	Copy boost::timer to tests since the original is deprecated and giving errors. We're not using Boost.Timer v2 components to avoid linking tests with its separately compiled binary. The legacy boost::timer is fine for the test purposes.	2023-06-05 16:03:18 +03:00
Andrey Semashev	b35192723c	Add clang-16 CI jobs, switch to clang-15 from stock Ubuntu repos.	2023-06-05 03:21:51 +03:00
Andrey Semashev	e1f75be395	Updated to GHA checkout@v3 to avoid deprecation warnings.	2022-10-18 17:58:37 +03:00
Andrey Semashev	fae4c2dacc	GitHub Actions config update. - Added gcc-12 and clang-13 through 15 jobs. - Added C++23 testing for gcc and clang on Linux. - Updated clang version for UBSAN job. - Updated Ubuntu version for clang jobs to avoid having to use external APT repository. - Updated python package installation for compatibility with Ubuntu 22.04.	2022-09-10 01:45:30 +03:00
Andrey Semashev	665cdbc94c	Switched gcc-9 to ubuntu-20.04 GHA CI image.	2022-08-14 17:55:06 +03:00
Andrey Semashev	df9ea43b66	Replaced ubuntu-18.04 GHA CI images with containers. Also use ubuntu-latest image for jobs that are running in a container.	2022-08-14 14:12:49 +03:00
Andrey Semashev	0376be4112	Switch to macos-11 GHA image as macos-10.15 is deprecated.	2022-08-12 16:02:38 +03:00