mirror of
https://github.com/boostorg/parameter.git
synced 2026-01-22 17:32:33 +00:00
Compare commits
3 Commits
boost-1.82
...
boost-1.83
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6538609cf5 | ||
|
|
02e1c566f7 | ||
|
|
b35192723c |
32
.github/workflows/ci.yml
vendored
32
.github/workflows/ci.yml
vendored
@@ -236,27 +236,33 @@ jobs:
|
||||
os: ubuntu-22.04
|
||||
install:
|
||||
- clang-15
|
||||
sources:
|
||||
- "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
|
||||
source_keys:
|
||||
- "https://apt.llvm.org/llvm-snapshot.gpg.key"
|
||||
- toolset: clang
|
||||
compiler: clang++-15
|
||||
compiler: clang++-16
|
||||
cxxstd: "03,11,14,17,20,2b"
|
||||
os: ubuntu-22.04
|
||||
install:
|
||||
- clang-15
|
||||
- libc++-15-dev
|
||||
- libc++abi-15-dev
|
||||
- clang-16
|
||||
sources:
|
||||
- "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
|
||||
- "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++-14
|
||||
compiler: clang++-15
|
||||
cxxstd: "03,11,14,17,20,2b"
|
||||
cxxflags: -stdlib=libc++
|
||||
linkflags: -stdlib=libc++
|
||||
@@ -264,9 +270,9 @@ jobs:
|
||||
build_variant: debug
|
||||
os: ubuntu-22.04
|
||||
install:
|
||||
- clang-14
|
||||
- libc++-14-dev
|
||||
- libc++abi-14-dev
|
||||
- clang-15
|
||||
- libc++-15-dev
|
||||
- libc++abi-15-dev
|
||||
|
||||
- toolset: clang
|
||||
cxxstd: "03,11,14,17,2a"
|
||||
|
||||
@@ -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_>
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace boost { namespace parameter { namespace aux {
|
||||
));
|
||||
#endif
|
||||
typedef int type;
|
||||
};
|
||||
};
|
||||
}}} // namespace boost::parameter::aux
|
||||
|
||||
#endif // include guard
|
||||
|
||||
@@ -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< \
|
||||
|
||||
@@ -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_>
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/**/
|
||||
#else
|
||||
#define BOOST_PARAMETER_MATCH_DEFAULTS(ArgTypes)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <boost/parameter/aux_/preprocessor/seq_enum.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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ project boost/parameter
|
||||
:
|
||||
default-build
|
||||
<warnings>off
|
||||
<include>.
|
||||
;
|
||||
|
||||
alias parameter_standard_tests
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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> >(
|
||||
|
||||
@@ -99,7 +99,7 @@ namespace test {
|
||||
return 1;
|
||||
}
|
||||
|
||||
struct X
|
||||
struct X
|
||||
{
|
||||
X(int x_ = -1) : x(x_)
|
||||
{
|
||||
|
||||
59
test/timer.hpp
Normal file
59
test/timer.hpp
Normal file
@@ -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
|
||||
Reference in New Issue
Block a user