diff options
| author | Martin Hořeňovský | 2020-03-30 10:34:21 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-04-24 18:58:44 +0200 |
| commit | e1e6872c4c0f79731894c9b763843af33d16bdab (patch) | |
| tree | 46761d72b6bf87088e152aa8f42d1b092f2c5c8b /src/catch2/benchmark | |
| parent | 3836aa9cebbd546fc3036836aac3b2e3f5fd9b74 (diff) | |
| download | catch3-e1e6872c4c0f79731894c9b763843af33d16bdab.tar.gz | |
Standardize header names and file locations
This is both a really big and a really small commit. It is small in
that it only contains renaming, moving and modification of include
directives caused by this.
It is really big in the obvious way of touching something like 200
files.
The new rules for naming files is simple: headers use the `.hpp`
extension. The rules for physical file layout is still kinda in
progress, but the basics are also simple:
* Significant parts of functionality get their own subfolder
* Benchmarking is in `catch2/benchmark`
* Matchers are in `catch2/matchers`
* Generators are in `catch2/generators`
* Reporters are in `catch2/reporters`
* Baseline testing facilities are in `catch2/`
* Various top level folders also contain `internal` subfolder,
with files that users probably do not want to include directly,
at least not until they have to write something like their own
reporter.
* The exact files in these subfolders is likely to change later
on
Note that while some includes were cleaned up in this commit, it
is only the low hanging fruit and further cleanup using automatic
tooling will happen later.
Also note that various include guards, copyright notices and file
headers will also be standardized later, rather than in this commit.
Diffstat (limited to 'src/catch2/benchmark')
7 files changed, 10 insertions, 11 deletions
diff --git a/src/catch2/benchmark/catch_benchmark.hpp b/src/catch2/benchmark/catch_benchmark.hpp index 154105c5..fe9866d6 100644 --- a/src/catch2/benchmark/catch_benchmark.hpp +++ b/src/catch2/benchmark/catch_benchmark.hpp @@ -11,9 +11,8 @@ #define TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED #include <catch2/catch_config.hpp> -#include <catch2/catch_context.h> -#include <catch2/catch_interfaces_reporter.h> -#include <catch2/catch_test_registry.h> +#include <catch2/internal/catch_context.hpp> +#include <catch2/interfaces/catch_interfaces_reporter.hpp> #include <catch2/benchmark/catch_chronometer.hpp> #include <catch2/benchmark/catch_clock.hpp> diff --git a/src/catch2/benchmark/catch_chronometer.hpp b/src/catch2/benchmark/catch_chronometer.hpp index e150d20d..12dcee00 100644 --- a/src/catch2/benchmark/catch_chronometer.hpp +++ b/src/catch2/benchmark/catch_chronometer.hpp @@ -14,7 +14,7 @@ #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> +#include <catch2/internal/catch_meta.hpp> namespace Catch { namespace Benchmark { diff --git a/src/catch2/benchmark/detail/catch_benchmark_function.hpp b/src/catch2/benchmark/detail/catch_benchmark_function.hpp index 4fd86896..5e86a154 100644 --- a/src/catch2/benchmark/detail/catch_benchmark_function.hpp +++ b/src/catch2/benchmark/detail/catch_benchmark_function.hpp @@ -13,7 +13,7 @@ #include <catch2/benchmark/catch_chronometer.hpp> #include <catch2/benchmark/detail/catch_complete_invoke.hpp> -#include <catch2/catch_meta.hpp> +#include <catch2/internal/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 497e0b3f..d6dc2e9d 100644 --- a/src/catch2/benchmark/detail/catch_complete_invoke.hpp +++ b/src/catch2/benchmark/detail/catch_complete_invoke.hpp @@ -11,9 +11,9 @@ #ifndef TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED -#include <catch2/catch_enforce.h> -#include <catch2/catch_interfaces_capture.h> -#include <catch2/catch_interfaces_registry_hub.h> +#include <catch2/internal/catch_enforce.hpp> +#include <catch2/interfaces/catch_interfaces_capture.hpp> +#include <catch2/interfaces/catch_interfaces_registry_hub.hpp> #include <type_traits> #include <utility> diff --git a/src/catch2/benchmark/detail/catch_run_for_at_least.cpp b/src/catch2/benchmark/detail/catch_run_for_at_least.cpp index 89c1e749..f1dcbaba 100644 --- a/src/catch2/benchmark/detail/catch_run_for_at_least.cpp +++ b/src/catch2/benchmark/detail/catch_run_for_at_least.cpp @@ -7,7 +7,7 @@ #include <catch2/benchmark/detail/catch_run_for_at_least.hpp> #include <exception> -#include <catch2/catch_enforce.h> +#include <catch2/internal/catch_enforce.hpp> namespace Catch { namespace Benchmark { 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 325e5227..ee5510d6 100644 --- a/src/catch2/benchmark/detail/catch_run_for_at_least.hpp +++ b/src/catch2/benchmark/detail/catch_run_for_at_least.hpp @@ -16,7 +16,7 @@ #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 <catch2/internal/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 5aacce01..11ca81b4 100644 --- a/src/catch2/benchmark/detail/catch_stats.cpp +++ b/src/catch2/benchmark/detail/catch_stats.cpp @@ -10,7 +10,7 @@ #include <catch2/benchmark/detail/catch_stats.hpp> -#include <catch2/catch_compiler_capabilities.h> +#include <catch2/internal/catch_compiler_capabilities.hpp> #include <cassert> #include <random> |