diff options
| author | Martin Hořeňovský | 2019-12-01 21:29:07 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-12-02 12:04:55 +0100 |
| commit | 82cc5bc034bfc54f7c5c34fffccc112f5e1892f7 (patch) | |
| tree | 997e55f5a56ebb6ef939a5881df1768f1c2a6714 /src/catch2/benchmark | |
| parent | fef4f217b12ec6cbcb6b680555ddd69c7c1e4a08 (diff) | |
| download | catch3-82cc5bc034bfc54f7c5c34fffccc112f5e1892f7.tar.gz | |
Rewrite includes inside the library to use <catch2/> form
Diffstat (limited to 'src/catch2/benchmark')
| -rw-r--r-- | src/catch2/benchmark/catch_benchmark.hpp | 28 | ||||
| -rw-r--r-- | src/catch2/benchmark/catch_chronometer.hpp | 8 | ||||
| -rw-r--r-- | src/catch2/benchmark/catch_environment.hpp | 4 | ||||
| -rw-r--r-- | src/catch2/benchmark/catch_execution_plan.hpp | 12 | ||||
| -rw-r--r-- | src/catch2/benchmark/catch_sample_analysis.hpp | 6 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_analyse.hpp | 6 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_benchmark_function.hpp | 6 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_complete_invoke.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_estimate_clock.hpp | 12 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_measure.hpp | 6 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_run_for_at_least.hpp | 12 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_stats.cpp | 4 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_stats.hpp | 6 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_timing.hpp | 4 |
14 files changed, 58 insertions, 58 deletions
diff --git a/src/catch2/benchmark/catch_benchmark.hpp b/src/catch2/benchmark/catch_benchmark.hpp index 3c061210..aef42c90 100644 --- a/src/catch2/benchmark/catch_benchmark.hpp +++ b/src/catch2/benchmark/catch_benchmark.hpp @@ -10,20 +10,20 @@ #ifndef TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED #define TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED -#include "../catch_config.hpp" -#include "../catch_context.h" -#include "../catch_interfaces_reporter.h" -#include "../catch_test_registry.h" - -#include "catch_chronometer.hpp" -#include "catch_clock.hpp" -#include "catch_environment.hpp" -#include "catch_execution_plan.hpp" -#include "detail/catch_estimate_clock.hpp" -#include "detail/catch_complete_invoke.hpp" -#include "detail/catch_analyse.hpp" -#include "detail/catch_benchmark_function.hpp" -#include "detail/catch_run_for_at_least.hpp" +#include <catch2/catch_config.hpp> +#include <catch2/catch_context.h> +#include <catch2/catch_interfaces_reporter.h> +#include <catch2/catch_test_registry.h> + +#include <catch2/benchmark/catch_chronometer.hpp> +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_environment.hpp> +#include <catch2/benchmark/catch_execution_plan.hpp> +#include <catch2/benchmark/detail/catch_estimate_clock.hpp> +#include <catch2/benchmark/detail/catch_complete_invoke.hpp> +#include <catch2/benchmark/detail/catch_analyse.hpp> +#include <catch2/benchmark/detail/catch_benchmark_function.hpp> +#include <catch2/benchmark/detail/catch_run_for_at_least.hpp> #include <algorithm> #include <functional> diff --git a/src/catch2/benchmark/catch_chronometer.hpp b/src/catch2/benchmark/catch_chronometer.hpp index 1022017d..19a7ec05 100644 --- a/src/catch2/benchmark/catch_chronometer.hpp +++ b/src/catch2/benchmark/catch_chronometer.hpp @@ -11,10 +11,10 @@ #ifndef TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED -#include "catch_clock.hpp" -#include "catch_optimizer.hpp" -#include "detail/catch_complete_invoke.hpp" -#include "../catch_meta.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_optimizer.hpp> +#include <catch2/benchmark/detail/catch_complete_invoke.hpp> +#include <catch2/catch_meta.hpp> namespace Catch { namespace Benchmark { diff --git a/src/catch2/benchmark/catch_environment.hpp b/src/catch2/benchmark/catch_environment.hpp index 55951249..090efa82 100644 --- a/src/catch2/benchmark/catch_environment.hpp +++ b/src/catch2/benchmark/catch_environment.hpp @@ -11,8 +11,8 @@ #ifndef TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED #define TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED -#include "catch_clock.hpp" -#include "catch_outlier_classification.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_outlier_classification.hpp> namespace Catch { namespace Benchmark { diff --git a/src/catch2/benchmark/catch_execution_plan.hpp b/src/catch2/benchmark/catch_execution_plan.hpp index e56c83aa..dcada8c8 100644 --- a/src/catch2/benchmark/catch_execution_plan.hpp +++ b/src/catch2/benchmark/catch_execution_plan.hpp @@ -11,12 +11,12 @@ #ifndef TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED #define TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED -#include "../catch_config.hpp" -#include "catch_clock.hpp" -#include "catch_environment.hpp" -#include "detail/catch_benchmark_function.hpp" -#include "detail/catch_repeat.hpp" -#include "detail/catch_run_for_at_least.hpp" +#include <catch2/catch_config.hpp> +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_environment.hpp> +#include <catch2/benchmark/detail/catch_benchmark_function.hpp> +#include <catch2/benchmark/detail/catch_repeat.hpp> +#include <catch2/benchmark/detail/catch_run_for_at_least.hpp> #include <algorithm> diff --git a/src/catch2/benchmark/catch_sample_analysis.hpp b/src/catch2/benchmark/catch_sample_analysis.hpp index 4550d0bc..98806864 100644 --- a/src/catch2/benchmark/catch_sample_analysis.hpp +++ b/src/catch2/benchmark/catch_sample_analysis.hpp @@ -11,9 +11,9 @@ #ifndef TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED -#include "catch_clock.hpp" -#include "catch_estimate.hpp" -#include "catch_outlier_classification.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_estimate.hpp> +#include <catch2/benchmark/catch_outlier_classification.hpp> #include <algorithm> #include <vector> diff --git a/src/catch2/benchmark/detail/catch_analyse.hpp b/src/catch2/benchmark/detail/catch_analyse.hpp index a3becbe4..3e009429 100644 --- a/src/catch2/benchmark/detail/catch_analyse.hpp +++ b/src/catch2/benchmark/detail/catch_analyse.hpp @@ -11,9 +11,9 @@ #ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED -#include "../catch_clock.hpp" -#include "../catch_sample_analysis.hpp" -#include "catch_stats.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_sample_analysis.hpp> +#include <catch2/benchmark/detail/catch_stats.hpp> #include <algorithm> #include <iterator> diff --git a/src/catch2/benchmark/detail/catch_benchmark_function.hpp b/src/catch2/benchmark/detail/catch_benchmark_function.hpp index 60c7f1d6..e25ae220 100644 --- a/src/catch2/benchmark/detail/catch_benchmark_function.hpp +++ b/src/catch2/benchmark/detail/catch_benchmark_function.hpp @@ -11,9 +11,9 @@ #ifndef TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED -#include "../catch_chronometer.hpp" -#include "catch_complete_invoke.hpp" -#include "../../catch_meta.hpp" +#include <catch2/benchmark/catch_chronometer.hpp> +#include <catch2/benchmark/detail/catch_complete_invoke.hpp> +#include <catch2/catch_meta.hpp> #include <cassert> #include <type_traits> diff --git a/src/catch2/benchmark/detail/catch_complete_invoke.hpp b/src/catch2/benchmark/detail/catch_complete_invoke.hpp index abeb2ac7..8306cc0f 100644 --- a/src/catch2/benchmark/detail/catch_complete_invoke.hpp +++ b/src/catch2/benchmark/detail/catch_complete_invoke.hpp @@ -11,7 +11,7 @@ #ifndef TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED -#include "../../catch_enforce.h" +#include <catch2/catch_enforce.h> #include <type_traits> #include <utility> diff --git a/src/catch2/benchmark/detail/catch_estimate_clock.hpp b/src/catch2/benchmark/detail/catch_estimate_clock.hpp index 055c5825..f244f745 100644 --- a/src/catch2/benchmark/detail/catch_estimate_clock.hpp +++ b/src/catch2/benchmark/detail/catch_estimate_clock.hpp @@ -11,12 +11,12 @@ #ifndef TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED -#include "../catch_clock.hpp" -#include "../catch_environment.hpp" -#include "catch_stats.hpp" -#include "catch_measure.hpp" -#include "catch_run_for_at_least.hpp" -#include "../catch_clock.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_environment.hpp> +#include <catch2/benchmark/detail/catch_stats.hpp> +#include <catch2/benchmark/detail/catch_measure.hpp> +#include <catch2/benchmark/detail/catch_run_for_at_least.hpp> +#include <catch2/benchmark/catch_clock.hpp> #include <algorithm> #include <iterator> diff --git a/src/catch2/benchmark/detail/catch_measure.hpp b/src/catch2/benchmark/detail/catch_measure.hpp index 62ed2809..9cee9793 100644 --- a/src/catch2/benchmark/detail/catch_measure.hpp +++ b/src/catch2/benchmark/detail/catch_measure.hpp @@ -11,9 +11,9 @@ #ifndef TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED -#include "../catch_clock.hpp" -#include "catch_complete_invoke.hpp" -#include "catch_timing.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/detail/catch_complete_invoke.hpp> +#include <catch2/benchmark/detail/catch_timing.hpp> #include <utility> diff --git a/src/catch2/benchmark/detail/catch_run_for_at_least.hpp b/src/catch2/benchmark/detail/catch_run_for_at_least.hpp index a41c6b46..24107c67 100644 --- a/src/catch2/benchmark/detail/catch_run_for_at_least.hpp +++ b/src/catch2/benchmark/detail/catch_run_for_at_least.hpp @@ -11,12 +11,12 @@ #ifndef TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED #define TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED -#include "../catch_clock.hpp" -#include "../catch_chronometer.hpp" -#include "catch_measure.hpp" -#include "catch_complete_invoke.hpp" -#include "catch_timing.hpp" -#include "../../catch_meta.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_chronometer.hpp> +#include <catch2/benchmark/detail/catch_measure.hpp> +#include <catch2/benchmark/detail/catch_complete_invoke.hpp> +#include <catch2/benchmark/detail/catch_timing.hpp> +#include <catch2/catch_meta.hpp> #include <utility> #include <type_traits> diff --git a/src/catch2/benchmark/detail/catch_stats.cpp b/src/catch2/benchmark/detail/catch_stats.cpp index b85b740e..f82fb0b7 100644 --- a/src/catch2/benchmark/detail/catch_stats.cpp +++ b/src/catch2/benchmark/detail/catch_stats.cpp @@ -10,9 +10,9 @@ #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) -#include "catch_stats.hpp" +#include <catch2/benchmark/detail/catch_stats.hpp> -#include "../../catch_compiler_capabilities.h" +#include <catch2/catch_compiler_capabilities.h> #include <cassert> #include <random> diff --git a/src/catch2/benchmark/detail/catch_stats.hpp b/src/catch2/benchmark/detail/catch_stats.hpp index e686c1aa..6fca2c49 100644 --- a/src/catch2/benchmark/detail/catch_stats.hpp +++ b/src/catch2/benchmark/detail/catch_stats.hpp @@ -11,9 +11,9 @@ #ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED -#include "../catch_clock.hpp" -#include "../catch_estimate.hpp" -#include "../catch_outlier_classification.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/catch_estimate.hpp> +#include <catch2/benchmark/catch_outlier_classification.hpp> #include <algorithm> #include <functional> diff --git a/src/catch2/benchmark/detail/catch_timing.hpp b/src/catch2/benchmark/detail/catch_timing.hpp index 073cb742..1e849194 100644 --- a/src/catch2/benchmark/detail/catch_timing.hpp +++ b/src/catch2/benchmark/detail/catch_timing.hpp @@ -11,8 +11,8 @@ #ifndef TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED -#include "../catch_clock.hpp" -#include "catch_complete_invoke.hpp" +#include <catch2/benchmark/catch_clock.hpp> +#include <catch2/benchmark/detail/catch_complete_invoke.hpp> #include <tuple> #include <type_traits> |