Rewrite includes inside the library to use <catch2/> form

This commit is contained in:
Martin Hořeňovský 2019-12-01 21:29:07 +01:00
parent fef4f217b1
commit 82cc5bc034
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
152 changed files with 483 additions and 483 deletions

View File

@ -10,20 +10,20 @@
#ifndef TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED #define TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED
#include "../catch_config.hpp" #include <catch2/catch_config.hpp>
#include "../catch_context.h" #include <catch2/catch_context.h>
#include "../catch_interfaces_reporter.h" #include <catch2/catch_interfaces_reporter.h>
#include "../catch_test_registry.h" #include <catch2/catch_test_registry.h>
#include "catch_chronometer.hpp" #include <catch2/benchmark/catch_chronometer.hpp>
#include "catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "catch_environment.hpp" #include <catch2/benchmark/catch_environment.hpp>
#include "catch_execution_plan.hpp" #include <catch2/benchmark/catch_execution_plan.hpp>
#include "detail/catch_estimate_clock.hpp" #include <catch2/benchmark/detail/catch_estimate_clock.hpp>
#include "detail/catch_complete_invoke.hpp" #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
#include "detail/catch_analyse.hpp" #include <catch2/benchmark/detail/catch_analyse.hpp>
#include "detail/catch_benchmark_function.hpp" #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
#include "detail/catch_run_for_at_least.hpp" #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>

View File

@ -11,10 +11,10 @@
#ifndef TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED
#include "catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "catch_optimizer.hpp" #include <catch2/benchmark/catch_optimizer.hpp>
#include "detail/catch_complete_invoke.hpp" #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
#include "../catch_meta.hpp" #include <catch2/catch_meta.hpp>
namespace Catch { namespace Catch {
namespace Benchmark { namespace Benchmark {

View File

@ -11,8 +11,8 @@
#ifndef TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED #define TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED
#include "catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "catch_outlier_classification.hpp" #include <catch2/benchmark/catch_outlier_classification.hpp>
namespace Catch { namespace Catch {
namespace Benchmark { namespace Benchmark {

View File

@ -11,12 +11,12 @@
#ifndef TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED #define TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED
#include "../catch_config.hpp" #include <catch2/catch_config.hpp>
#include "catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "catch_environment.hpp" #include <catch2/benchmark/catch_environment.hpp>
#include "detail/catch_benchmark_function.hpp" #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
#include "detail/catch_repeat.hpp" #include <catch2/benchmark/detail/catch_repeat.hpp>
#include "detail/catch_run_for_at_least.hpp" #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
#include <algorithm> #include <algorithm>

View File

@ -11,9 +11,9 @@
#ifndef TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED
#include "catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "catch_estimate.hpp" #include <catch2/benchmark/catch_estimate.hpp>
#include "catch_outlier_classification.hpp" #include <catch2/benchmark/catch_outlier_classification.hpp>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>

View File

@ -11,9 +11,9 @@
#ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED
#include "../catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "../catch_sample_analysis.hpp" #include <catch2/benchmark/catch_sample_analysis.hpp>
#include "catch_stats.hpp" #include <catch2/benchmark/detail/catch_stats.hpp>
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>

View File

@ -11,9 +11,9 @@
#ifndef TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED
#include "../catch_chronometer.hpp" #include <catch2/benchmark/catch_chronometer.hpp>
#include "catch_complete_invoke.hpp" #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
#include "../../catch_meta.hpp" #include <catch2/catch_meta.hpp>
#include <cassert> #include <cassert>
#include <type_traits> #include <type_traits>

View File

@ -11,7 +11,7 @@
#ifndef TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED
#define 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 <type_traits>
#include <utility> #include <utility>

View File

@ -11,12 +11,12 @@
#ifndef TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED
#include "../catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "../catch_environment.hpp" #include <catch2/benchmark/catch_environment.hpp>
#include "catch_stats.hpp" #include <catch2/benchmark/detail/catch_stats.hpp>
#include "catch_measure.hpp" #include <catch2/benchmark/detail/catch_measure.hpp>
#include "catch_run_for_at_least.hpp" #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
#include "../catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>

View File

@ -11,9 +11,9 @@
#ifndef TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED
#include "../catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "catch_complete_invoke.hpp" #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
#include "catch_timing.hpp" #include <catch2/benchmark/detail/catch_timing.hpp>
#include <utility> #include <utility>

View File

@ -11,12 +11,12 @@
#ifndef TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED #define TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
#include "../catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "../catch_chronometer.hpp" #include <catch2/benchmark/catch_chronometer.hpp>
#include "catch_measure.hpp" #include <catch2/benchmark/detail/catch_measure.hpp>
#include "catch_complete_invoke.hpp" #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
#include "catch_timing.hpp" #include <catch2/benchmark/detail/catch_timing.hpp>
#include "../../catch_meta.hpp" #include <catch2/catch_meta.hpp>
#include <utility> #include <utility>
#include <type_traits> #include <type_traits>

View File

@ -10,9 +10,9 @@
#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) #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 <cassert>
#include <random> #include <random>

View File

@ -11,9 +11,9 @@
#ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED
#include "../catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "../catch_estimate.hpp" #include <catch2/benchmark/catch_estimate.hpp>
#include "../catch_outlier_classification.hpp" #include <catch2/benchmark/catch_outlier_classification.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>

View File

@ -11,8 +11,8 @@
#ifndef TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED
#include "../catch_clock.hpp" #include <catch2/benchmark/catch_clock.hpp>
#include "catch_complete_invoke.hpp" #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>

View File

@ -19,7 +19,7 @@
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#include "catch_suppress_warnings.h" #include <catch2/catch_suppress_warnings.h>
#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) #if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
# define CATCH_IMPL # define CATCH_IMPL
@ -39,7 +39,7 @@
#endif #endif
#if !defined(CATCH_CONFIG_IMPL_ONLY) #if !defined(CATCH_CONFIG_IMPL_ONLY)
#include "catch_platform.h" #include <catch2/catch_platform.h>
#ifdef CATCH_IMPL #ifdef CATCH_IMPL
# ifndef CLARA_CONFIG_MAIN # ifndef CLARA_CONFIG_MAIN
@ -48,49 +48,49 @@
# endif # endif
#endif #endif
#include "catch_user_interfaces.h" #include <catch2/catch_user_interfaces.h>
#include "catch_tag_alias_autoregistrar.h" #include <catch2/catch_tag_alias_autoregistrar.h>
#include "catch_test_registry.h" #include <catch2/catch_test_registry.h>
#include "catch_capture.hpp" #include <catch2/catch_capture.hpp>
#include "catch_section.h" #include <catch2/catch_section.h>
#include "catch_interfaces_exception.h" #include <catch2/catch_interfaces_exception.h>
#include "catch_approx.h" #include <catch2/catch_approx.h>
#include "catch_compiler_capabilities.h" #include <catch2/catch_compiler_capabilities.h>
#include "catch_string_manip.h" #include <catch2/catch_string_manip.h>
#ifndef CATCH_CONFIG_DISABLE_MATCHERS #ifndef CATCH_CONFIG_DISABLE_MATCHERS
#include "catch_capture_matchers.h" #include <catch2/catch_capture_matchers.h>
#endif #endif
#include "catch_generators.hpp" #include <catch2/catch_generators.hpp>
#include "catch_generators_generic.hpp" #include <catch2/catch_generators_generic.hpp>
#include "catch_generators_specific.hpp" #include <catch2/catch_generators_specific.hpp>
// These files are included here so the single_include script doesn't put them // These files are included here so the single_include script doesn't put them
// in the conditionally compiled sections // in the conditionally compiled sections
#include "catch_test_case_info.h" #include <catch2/catch_test_case_info.h>
#include "catch_interfaces_runner.h" #include <catch2/catch_interfaces_runner.h>
#ifdef __OBJC__ #ifdef __OBJC__
#include "catch_objc.hpp" #include <catch2/catch_objc.hpp>
#endif #endif
// Benchmarking needs the externally-facing parts of reporters to work // Benchmarking needs the externally-facing parts of reporters to work
#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING) #if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
#include "catch_external_interfaces.h" #include <catch2/catch_external_interfaces.h>
#endif #endif
#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
#include "benchmark/catch_benchmark.hpp" #include <catch2/benchmark/catch_benchmark.hpp>
#endif #endif
#endif // ! CATCH_CONFIG_IMPL_ONLY #endif // ! CATCH_CONFIG_IMPL_ONLY
#ifdef CATCH_IMPL #ifdef CATCH_IMPL
#include "catch_impl.hpp" #include <catch2/catch_impl.hpp>
#endif #endif
#ifdef CATCH_CONFIG_MAIN #ifdef CATCH_CONFIG_MAIN
#include "catch_default_main.hpp" #include <catch2/catch_default_main.hpp>
#endif #endif
@ -485,6 +485,6 @@ using Catch::Detail::Approx;
#endif // ! CATCH_CONFIG_IMPL_ONLY #endif // ! CATCH_CONFIG_IMPL_ONLY
#include "catch_reenable_warnings.h" #include <catch2/catch_reenable_warnings.h>
#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_HPP_INCLUDED

View File

@ -6,8 +6,8 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_approx.h" #include <catch2/catch_approx.h>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include <cmath> #include <cmath>
#include <limits> #include <limits>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED #define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
#include "catch_tostring.h" #include <catch2/catch_tostring.h>
#include <type_traits> #include <type_traits>

View File

@ -6,15 +6,15 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_assertionhandler.h" #include <catch2/catch_assertionhandler.h>
#include "catch_assertionresult.h" #include <catch2/catch_assertionresult.h>
#include "catch_interfaces_runner.h" #include <catch2/catch_interfaces_runner.h>
#include "catch_interfaces_config.h" #include <catch2/catch_interfaces_config.h>
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_debugger.h" #include <catch2/catch_debugger.h>
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
#include "catch_capture_matchers.h" #include <catch2/catch_capture_matchers.h>
#include "catch_run_context.h" #include <catch2/catch_run_context.h>
namespace Catch { namespace Catch {

View File

@ -8,9 +8,9 @@
#ifndef TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
#define TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED #define TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
#include "catch_assertioninfo.h" #include <catch2/catch_assertioninfo.h>
#include "catch_decomposer.h" #include <catch2/catch_decomposer.h>
#include "catch_interfaces_capture.h" #include <catch2/catch_interfaces_capture.h>
namespace Catch { namespace Catch {

View File

@ -8,9 +8,9 @@
#ifndef TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED
#define TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED #define TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED
#include "catch_result_type.h" #include <catch2/catch_result_type.h>
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
namespace Catch { namespace Catch {

View File

@ -6,7 +6,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_assertionresult.h" #include <catch2/catch_assertionresult.h>
namespace Catch { namespace Catch {
AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression): AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):

View File

@ -9,11 +9,11 @@
#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED #define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
#include <string> #include <string>
#include "catch_assertioninfo.h" #include <catch2/catch_assertioninfo.h>
#include "catch_result_type.h" #include <catch2/catch_result_type.h>
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
#include "catch_assertionhandler.h" #include <catch2/catch_assertionhandler.h>
namespace Catch { namespace Catch {

View File

@ -8,10 +8,10 @@
#ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
#include "catch_assertionhandler.h" #include <catch2/catch_assertionhandler.h>
#include "catch_interfaces_capture.h" #include <catch2/catch_interfaces_capture.h>
#include "catch_message.h" #include <catch2/catch_message.h>
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
#if !defined(CATCH_CONFIG_DISABLE) #if !defined(CATCH_CONFIG_DISABLE)

View File

@ -5,8 +5,8 @@
* Distributed under the Boost Software License, Version 1.0. (See accompanying * 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) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_capture_matchers.h" #include <catch2/catch_capture_matchers.h>
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
namespace Catch { namespace Catch {

View File

@ -8,14 +8,14 @@
#ifndef TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
#include "catch_capture.hpp" #include <catch2/catch_capture.hpp>
#include "catch_matchers.h" #include <catch2/catch_matchers.h>
#include "catch_matchers_exception.hpp" #include <catch2/catch_matchers_exception.hpp>
#include "catch_matchers_floating.h" #include <catch2/catch_matchers_floating.h>
#include "catch_matchers_generic.hpp" #include <catch2/catch_matchers_generic.hpp>
#include "catch_matchers_string.h" #include <catch2/catch_matchers_string.h>
#include "catch_matchers_vector.h" #include <catch2/catch_matchers_vector.h>
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
namespace Catch { namespace Catch {

View File

@ -23,7 +23,7 @@
#pragma clang diagnostic ignored "-Wshadow" #pragma clang diagnostic ignored "-Wshadow"
#endif #endif
#include "external/clara.hpp" #include <catch2/external/clara.hpp>
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop

View File

@ -6,12 +6,12 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_commandline.h" #include <catch2/catch_commandline.h>
#include "catch_string_manip.h" #include <catch2/catch_string_manip.h>
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
#include "catch_interfaces_reporter.h" #include <catch2/catch_interfaces_reporter.h>
#include <fstream> #include <fstream>
#include <ctime> #include <ctime>

View File

@ -8,8 +8,8 @@
#ifndef TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
#include "catch_config.hpp" #include <catch2/catch_config.hpp>
#include "catch_clara.h" #include <catch2/catch_clara.h>
namespace Catch { namespace Catch {

View File

@ -6,9 +6,9 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_interfaces_config.h" #include <catch2/catch_interfaces_config.h>
#include <cstring> #include <cstring>
#include <ostream> #include <ostream>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_COMMON_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED #define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
#include "catch_compiler_capabilities.h" #include <catch2/catch_compiler_capabilities.h>
#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line #define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) #define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )

View File

@ -25,7 +25,7 @@
// Many features, at point of detection, define an _INTERNAL_ macro, so they // Many features, at point of detection, define an _INTERNAL_ macro, so they
// can be combined, en-mass, with the _NO_ forms later. // can be combined, en-mass, with the _NO_ forms later.
#include "catch_platform.h" #include <catch2/catch_platform.h>
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -5,9 +5,9 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_config.hpp" #include <catch2/catch_config.hpp>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
namespace Catch { namespace Catch {

View File

@ -8,11 +8,11 @@
#ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
#include "catch_test_spec_parser.h" #include <catch2/catch_test_spec_parser.h>
#include "catch_interfaces_config.h" #include <catch2/catch_interfaces_config.h>
// Libstdc++ doesn't like incomplete classes for unique_ptr // Libstdc++ doesn't like incomplete classes for unique_ptr
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include <memory> #include <memory>
#include <vector> #include <vector>

View File

@ -13,15 +13,15 @@
#endif #endif
#include "catch_console_colour.h" #include <catch2/catch_console_colour.h>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include "catch_errno_guard.h" #include <catch2/catch_errno_guard.h>
#include "catch_interfaces_config.h" #include <catch2/catch_interfaces_config.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_platform.h" #include <catch2/catch_platform.h>
#include "catch_debugger.h" #include <catch2/catch_debugger.h>
#include "catch_windows_h_proxy.h" #include <catch2/catch_windows_h_proxy.h>
#include <sstream> #include <sstream>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
#include "catch_common.h" #include <catch2/catch_common.h>
namespace Catch { namespace Catch {

View File

@ -5,9 +5,9 @@
* Distributed under the Boost Software License, Version 1.0. (See accompanying * 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) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_random_number_generator.h" #include <catch2/catch_random_number_generator.h>
namespace Catch { namespace Catch {

View File

@ -6,11 +6,11 @@
* *
*/ */
#include "catch_debug_console.h" #include <catch2/catch_debug_console.h>
#include "catch_compiler_capabilities.h" #include <catch2/catch_compiler_capabilities.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include "catch_platform.h" #include <catch2/catch_platform.h>
#include "catch_windows_h_proxy.h" #include <catch2/catch_windows_h_proxy.h>
#if defined(CATCH_CONFIG_ANDROID_LOGWRITE) #if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
#include <android/log.h> #include <android/log.h>

View File

@ -7,10 +7,10 @@
* *
*/ */
#include "catch_debugger.h" #include <catch2/catch_debugger.h>
#include "catch_errno_guard.h" #include <catch2/catch_errno_guard.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include "catch_platform.h" #include <catch2/catch_platform.h>
#ifdef CATCH_PLATFORM_MAC #ifdef CATCH_PLATFORM_MAC

View File

@ -9,7 +9,7 @@
#ifndef TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
#define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED #define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
#include "catch_platform.h" #include <catch2/catch_platform.h>
namespace Catch { namespace Catch {
bool isDebuggerActive(); bool isDebuggerActive();

View File

@ -6,8 +6,8 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_decomposer.h" #include <catch2/catch_decomposer.h>
#include "catch_config.hpp" #include <catch2/catch_config.hpp>
namespace Catch { namespace Catch {

View File

@ -8,9 +8,9 @@
#ifndef TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED
#define TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED #define TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED
#include "catch_tostring.h" #include <catch2/catch_tostring.h>
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
#include "catch_meta.hpp" #include <catch2/catch_meta.hpp>
#include <iosfwd> #include <iosfwd>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED #define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
#include "catch_session.h" #include <catch2/catch_session.h>
#ifndef __OBJC__ #ifndef __OBJC__

View File

@ -5,7 +5,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include <stdexcept> #include <stdexcept>

View File

@ -7,9 +7,9 @@
#ifndef TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED
#define TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED #define TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_compiler_capabilities.h" #include <catch2/catch_compiler_capabilities.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include <exception> #include <exception>

View File

@ -5,9 +5,9 @@
* Distributed under the Boost Software License, Version 1.0. (See accompanying * 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) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_enum_values_registry.h" #include <catch2/catch_enum_values_registry.h>
#include "catch_string_manip.h" #include <catch2/catch_string_manip.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include <map> #include <map>
#include <cassert> #include <cassert>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED
#define TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED #define TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED
#include "catch_interfaces_enum_values_registry.h" #include <catch2/catch_interfaces_enum_values_registry.h>
#include <vector> #include <vector>
#include <memory> #include <memory>

View File

@ -5,7 +5,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_errno_guard.h" #include <catch2/catch_errno_guard.h>
#include <cerrno> #include <cerrno>

View File

@ -6,10 +6,10 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_exception_translator_registry.h" #include <catch2/catch_exception_translator_registry.h>
#include "catch_assertionhandler.h" #include <catch2/catch_assertionhandler.h>
#include "catch_compiler_capabilities.h" #include <catch2/catch_compiler_capabilities.h>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#ifdef __OBJC__ #ifdef __OBJC__
#import "Foundation/Foundation.h" #import "Foundation/Foundation.h"

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED #define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
#include "catch_interfaces_exception.h" #include <catch2/catch_interfaces_exception.h>
#include <vector> #include <vector>
#include <string> #include <string>
#include <memory> #include <memory>

View File

@ -7,14 +7,14 @@
#ifndef TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
#define TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED #define TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
#include "reporters/catch_reporter_bases.hpp" #include <catch2/reporters/catch_reporter_bases.hpp>
#include "catch_console_colour.h" #include <catch2/catch_console_colour.h>
#include "catch_reporter_registrars.hpp" #include <catch2/catch_reporter_registrars.hpp>
// Allow users to base their work off existing reporters // Allow users to base their work off existing reporters
#include "reporters/catch_reporter_compact.h" #include <catch2/reporters/catch_reporter_compact.h>
#include "reporters/catch_reporter_console.h" #include <catch2/reporters/catch_reporter_console.h>
#include "reporters/catch_reporter_junit.h" #include <catch2/reporters/catch_reporter_junit.h>
#include "reporters/catch_reporter_xml.h" #include <catch2/reporters/catch_reporter_xml.h>
#endif // TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED #endif // TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED

View File

@ -7,10 +7,10 @@
* *
*/ */
#include "catch_fatal_condition.h" #include <catch2/catch_fatal_condition.h>
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_interfaces_capture.h" #include <catch2/catch_interfaces_capture.h>
#if defined(__GNUC__) #if defined(__GNUC__)
# pragma GCC diagnostic push # pragma GCC diagnostic push

View File

@ -9,9 +9,9 @@
#ifndef TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
#define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED #define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
#include "catch_platform.h" #include <catch2/catch_platform.h>
#include "catch_compiler_capabilities.h" #include <catch2/catch_compiler_capabilities.h>
#include "catch_windows_h_proxy.h" #include <catch2/catch_windows_h_proxy.h>
#if defined( CATCH_CONFIG_WINDOWS_SEH ) #if defined( CATCH_CONFIG_WINDOWS_SEH )

View File

@ -5,9 +5,9 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_generators.hpp" #include <catch2/catch_generators.hpp>
#include "catch_random_number_generator.h" #include <catch2/catch_random_number_generator.h>
#include "catch_interfaces_capture.h" #include <catch2/catch_interfaces_capture.h>
#include <limits> #include <limits>
#include <set> #include <set>

View File

@ -7,9 +7,9 @@
#ifndef TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
#include "catch_interfaces_generatortracker.h" #include <catch2/catch_interfaces_generatortracker.h>
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include <memory> #include <memory>
#include <vector> #include <vector>

View File

@ -7,8 +7,8 @@
#ifndef TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED #define TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED
#include "catch_generators.hpp" #include <catch2/catch_generators.hpp>
#include "catch_meta.hpp" #include <catch2/catch_meta.hpp>
namespace Catch { namespace Catch {
namespace Generators { namespace Generators {

View File

@ -7,10 +7,10 @@
#ifndef TWOBLUECUBES_CATCH_GENERATORS_SPECIFIC_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_GENERATORS_SPECIFIC_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_GENERATORS_SPECIFIC_HPP_INCLUDED #define TWOBLUECUBES_CATCH_GENERATORS_SPECIFIC_HPP_INCLUDED
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_generators.hpp" #include <catch2/catch_generators.hpp>
#include "catch_interfaces_config.h" #include <catch2/catch_interfaces_config.h>
#include "catch_random_number_generator.h" #include <catch2/catch_random_number_generator.h>
#include <random> #include <random>

View File

@ -14,10 +14,10 @@
#endif #endif
// Keep these here for external reporters // Keep these here for external reporters
#include "catch_test_spec.h" #include <catch2/catch_test_spec.h>
#include "catch_test_case_tracker.h" #include <catch2/catch_test_case_tracker.h>
#include "catch_leak_detector.h" #include <catch2/catch_leak_detector.h>
// Cpp files will be included in the single-header file here // Cpp files will be included in the single-header file here
// ~*~* CATCH_CPP_STITCH_PLACE *~*~ // ~*~* CATCH_CPP_STITCH_PLACE *~*~

View File

@ -1,4 +1,4 @@
#include "catch_interfaces_capture.h" #include <catch2/catch_interfaces_capture.h>
namespace Catch { namespace Catch {
IResultCapture::~IResultCapture() = default; IResultCapture::~IResultCapture() = default;

View File

@ -11,8 +11,8 @@
#include <string> #include <string>
#include <chrono> #include <chrono>
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
#include "catch_result_type.h" #include <catch2/catch_result_type.h>
namespace Catch { namespace Catch {

View File

@ -1,4 +1,4 @@
#include "catch_interfaces_config.h" #include <catch2/catch_interfaces_config.h>
namespace Catch { namespace Catch {
IConfig::~IConfig() = default; IConfig::~IConfig() = default;

View File

@ -8,8 +8,8 @@
#ifndef TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
#define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED #define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_option.hpp" #include <catch2/catch_option.hpp>
#include <iosfwd> #include <iosfwd>
#include <string> #include <string>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED
#define TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED #define TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
#include <vector> #include <vector>

View File

@ -1,4 +1,4 @@
#include "catch_interfaces_exception.h" #include <catch2/catch_interfaces_exception.h>
namespace Catch { namespace Catch {
IExceptionTranslator::~IExceptionTranslator() = default; IExceptionTranslator::~IExceptionTranslator() = default;

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED #define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
#if defined(CATCH_CONFIG_DISABLE) #if defined(CATCH_CONFIG_DISABLE)
#define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \ #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \

View File

@ -1,4 +1,4 @@
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
namespace Catch { namespace Catch {
IRegistryHub::~IRegistryHub() = default; IRegistryHub::~IRegistryHub() = default;

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED #define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
#include "catch_common.h" #include <catch2/catch_common.h>
#include <string> #include <string>
#include <memory> #include <memory>

View File

@ -5,11 +5,11 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_interfaces_reporter.h" #include <catch2/catch_interfaces_reporter.h>
#include "catch_console_colour.h" #include <catch2/catch_console_colour.h>
#include "reporters/catch_reporter_listening.h" #include <catch2/reporters/catch_reporter_listening.h>
#include "catch_list.h" #include <catch2/catch_list.h>
#include "catch_text.h" #include <catch2/catch_text.h>
#include <algorithm> #include <algorithm>
#include <iomanip> #include <iomanip>

View File

@ -8,19 +8,19 @@
#ifndef TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED #define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
#include "catch_section_info.h" #include <catch2/catch_section_info.h>
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_config.hpp" #include <catch2/catch_config.hpp>
#include "catch_totals.h" #include <catch2/catch_totals.h>
#include "catch_test_case_info.h" #include <catch2/catch_test_case_info.h>
#include "catch_assertionresult.h" #include <catch2/catch_assertionresult.h>
#include "catch_message.h" #include <catch2/catch_message.h>
#include "catch_option.hpp" #include <catch2/catch_option.hpp>
#include "catch_stringref.h" #include <catch2/catch_stringref.h>
#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
#include "benchmark/catch_estimate.hpp" #include <catch2/benchmark/catch_estimate.hpp>
#include "benchmark/catch_outlier_classification.hpp" #include <catch2/benchmark/catch_outlier_classification.hpp>
#endif // CATCH_CONFIG_ENABLE_BENCHMARKING #endif // CATCH_CONFIG_ENABLE_BENCHMARKING

View File

@ -1,4 +1,4 @@
#include "catch_interfaces_runner.h" #include <catch2/catch_interfaces_runner.h>
namespace Catch { namespace Catch {
IRunner::~IRunner() = default; IRunner::~IRunner() = default;

View File

@ -1,4 +1,4 @@
#include "catch_interfaces_testcase.h" #include <catch2/catch_interfaces_testcase.h>
namespace Catch { namespace Catch {
ITestInvoker::~ITestInvoker() = default; ITestInvoker::~ITestInvoker() = default;

View File

@ -5,8 +5,8 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_leak_detector.h" #include <catch2/catch_leak_detector.h>
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
#ifdef CATCH_CONFIG_WINDOWS_CRTDBG #ifdef CATCH_CONFIG_WINDOWS_CRTDBG

View File

@ -6,20 +6,20 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_list.h" #include <catch2/catch_list.h>
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
#include "catch_interfaces_reporter.h" #include <catch2/catch_interfaces_reporter.h>
#include "catch_interfaces_testcase.h" #include <catch2/catch_interfaces_testcase.h>
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include "catch_text.h" #include <catch2/catch_text.h>
#include "catch_console_colour.h" #include <catch2/catch_console_colour.h>
#include "catch_test_spec_parser.h" #include <catch2/catch_test_spec_parser.h>
#include "catch_tostring.h" #include <catch2/catch_tostring.h>
#include "catch_string_manip.h" #include <catch2/catch_string_manip.h>
#include <limits> #include <limits>
#include <algorithm> #include <algorithm>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_LIST_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_LIST_H_INCLUDED
#define TWOBLUECUBES_CATCH_LIST_H_INCLUDED #define TWOBLUECUBES_CATCH_LIST_H_INCLUDED
#include "catch_config.hpp" #include <catch2/catch_config.hpp>
#include <set> #include <set>
#include <string> #include <string>

View File

@ -5,7 +5,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_matchers.h" #include <catch2/catch_matchers.h>
namespace Catch { namespace Catch {
namespace Matchers { namespace Matchers {

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
#include "catch_common.h" #include <catch2/catch_common.h>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -5,7 +5,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_matchers_exception.hpp" #include <catch2/catch_matchers_exception.hpp>
namespace Catch { namespace Catch {

View File

@ -7,7 +7,7 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED #define TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
#include "catch_matchers.h" #include <catch2/catch_matchers.h>
namespace Catch { namespace Catch {
namespace Matchers { namespace Matchers {

View File

@ -5,11 +5,11 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_matchers_floating.h" #include <catch2/catch_matchers_floating.h>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include "catch_polyfills.hpp" #include <catch2/catch_polyfills.hpp>
#include "catch_to_string.hpp" #include <catch2/catch_to_string.hpp>
#include "catch_tostring.h" #include <catch2/catch_tostring.h>
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>

View File

@ -7,7 +7,7 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED #define TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
#include "catch_matchers.h" #include <catch2/catch_matchers.h>
namespace Catch { namespace Catch {
namespace Matchers { namespace Matchers {

View File

@ -1,4 +1,4 @@
#include "catch_matchers_generic.hpp" #include <catch2/catch_matchers_generic.hpp>
std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) { std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
if (desc.empty()) { if (desc.empty()) {

View File

@ -7,9 +7,9 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED #define TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_matchers.h" #include <catch2/catch_matchers.h>
#include "catch_meta.hpp" #include <catch2/catch_meta.hpp>
#include <string> #include <string>
#include <utility> #include <utility>

View File

@ -6,9 +6,9 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_matchers_string.h" #include <catch2/catch_matchers_string.h>
#include "catch_string_manip.h" #include <catch2/catch_string_manip.h>
#include "catch_tostring.h" #include <catch2/catch_tostring.h>
#include <regex> #include <regex>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED #define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
#include "catch_matchers.h" #include <catch2/catch_matchers.h>
#include <string> #include <string>

View File

@ -8,8 +8,8 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED #define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
#include "catch_matchers.h" #include <catch2/catch_matchers.h>
#include "catch_approx.h" #include <catch2/catch_approx.h>
#include <algorithm> #include <algorithm>

View File

@ -6,10 +6,10 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_message.h" #include <catch2/catch_message.h>
#include "catch_interfaces_capture.h" #include <catch2/catch_interfaces_capture.h>
#include "catch_uncaught_exceptions.h" #include <catch2/catch_uncaught_exceptions.h>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include <cassert> #include <cassert>
#include <stack> #include <stack>

View File

@ -8,11 +8,11 @@
#ifndef TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
#define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED #define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
#include "catch_result_type.h" #include <catch2/catch_result_type.h>
#include "catch_common.h" #include <catch2/catch_common.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include "catch_interfaces_capture.h" #include <catch2/catch_interfaces_capture.h>
#include "catch_tostring.h" #include <catch2/catch_tostring.h>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED #define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
#include "catch_objc_arc.hpp" #include <catch2/catch_objc_arc.hpp>
#import <objc/runtime.h> #import <objc/runtime.h>
@ -17,9 +17,9 @@
// NB. Any general catch headers included here must be included // NB. Any general catch headers included here must be included
// in catch.hpp first to make sure they are included by the single // in catch.hpp first to make sure they are included by the single
// header for non obj-usage // header for non obj-usage
#include "catch_test_case_info.h" #include <catch2/catch_test_case_info.h>
#include "catch_string_manip.h" #include <catch2/catch_string_manip.h>
#include "catch_tostring.h" #include <catch2/catch_tostring.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// This protocol is really only here for (self) documenting purposes, since // This protocol is really only here for (self) documenting purposes, since

View File

@ -5,8 +5,8 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_output_redirect.h" #include <catch2/catch_output_redirect.h>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>

View File

@ -7,8 +7,8 @@
#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H #ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H #define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
#include "catch_platform.h" #include <catch2/catch_platform.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include <cstdio> #include <cstdio>
#include <iosfwd> #include <iosfwd>

View File

@ -5,7 +5,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_polyfills.hpp" #include <catch2/catch_polyfills.hpp>
#include <cmath> #include <cmath>

View File

@ -5,10 +5,10 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_random_number_generator.h" #include <catch2/catch_random_number_generator.h>
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_run_context.h" #include <catch2/catch_run_context.h>
#include "catch_interfaces_config.h" #include <catch2/catch_interfaces_config.h>
namespace Catch { namespace Catch {

View File

@ -6,16 +6,16 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_test_case_registry_impl.h" #include <catch2/catch_test_case_registry_impl.h>
#include "catch_reporter_registry.h" #include <catch2/catch_reporter_registry.h>
#include "catch_exception_translator_registry.h" #include <catch2/catch_exception_translator_registry.h>
#include "catch_tag_alias_registry.h" #include <catch2/catch_tag_alias_registry.h>
#include "catch_startup_exception_registry.h" #include <catch2/catch_startup_exception_registry.h>
#include "catch_singletons.hpp" #include <catch2/catch_singletons.hpp>
#include "catch_enum_values_registry.h" #include <catch2/catch_enum_values_registry.h>
namespace Catch { namespace Catch {

View File

@ -9,7 +9,7 @@
#ifndef TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
#include "catch_interfaces_registry_hub.h" #include <catch2/catch_interfaces_registry_hub.h>
namespace Catch { namespace Catch {

View File

@ -4,7 +4,7 @@
* Distributed under the Boost Software License, Version 1.0. (See accompanying * 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) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_reporter_registry.h" #include <catch2/catch_reporter_registry.h>
#include <catch2/catch_reporter_registrars.hpp> #include <catch2/catch_reporter_registrars.hpp>
#include <catch2/reporters/catch_reporter_compact.h> #include <catch2/reporters/catch_reporter_compact.h>

View File

@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED
#define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED #define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED
#include "catch_interfaces_reporter.h" #include <catch2/catch_interfaces_reporter.h>
#include <map> #include <map>

View File

@ -6,7 +6,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_result_type.h" #include <catch2/catch_result_type.h>
namespace Catch { namespace Catch {

View File

@ -1,10 +1,10 @@
#include "catch_run_context.h" #include <catch2/catch_run_context.h>
#include "catch_compiler_capabilities.h" #include <catch2/catch_compiler_capabilities.h>
#include "catch_context.h" #include <catch2/catch_context.h>
#include "catch_enforce.h" #include <catch2/catch_enforce.h>
#include "catch_random_number_generator.h" #include <catch2/catch_random_number_generator.h>
#include "catch_stream.h" #include <catch2/catch_stream.h>
#include "catch_output_redirect.h" #include <catch2/catch_output_redirect.h>
#include <cassert> #include <cassert>
#include <algorithm> #include <algorithm>

View File

@ -8,20 +8,20 @@
#ifndef TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED #define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
#include "catch_interfaces_generatortracker.h" #include <catch2/catch_interfaces_generatortracker.h>
#include "catch_interfaces_runner.h" #include <catch2/catch_interfaces_runner.h>
#include "catch_interfaces_reporter.h" #include <catch2/catch_interfaces_reporter.h>
#include "catch_interfaces_exception.h" #include <catch2/catch_interfaces_exception.h>
#include "catch_config.hpp" #include <catch2/catch_config.hpp>
#include "catch_test_registry.h" #include <catch2/catch_test_registry.h>
#include "catch_test_case_info.h" #include <catch2/catch_test_case_info.h>
#include "catch_capture.hpp" #include <catch2/catch_capture.hpp>
#include "catch_totals.h" #include <catch2/catch_totals.h>
#include "catch_test_spec.h" #include <catch2/catch_test_spec.h>
#include "catch_test_case_tracker.h" #include <catch2/catch_test_case_tracker.h>
#include "catch_timer.h" #include <catch2/catch_timer.h>
#include "catch_assertionhandler.h" #include <catch2/catch_assertionhandler.h>
#include "catch_fatal_condition.h" #include <catch2/catch_fatal_condition.h>
#include <string> #include <string>

View File

@ -6,9 +6,9 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "catch_section.h" #include <catch2/catch_section.h>
#include "catch_capture.hpp" #include <catch2/catch_capture.hpp>
#include "catch_uncaught_exceptions.h" #include <catch2/catch_uncaught_exceptions.h>
namespace Catch { namespace Catch {

View File

@ -8,10 +8,10 @@
#ifndef TWOBLUECUBES_CATCH_SECTION_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
#define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED #define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
#include "catch_compiler_capabilities.h" #include <catch2/catch_compiler_capabilities.h>
#include "catch_section_info.h" #include <catch2/catch_section_info.h>
#include "catch_totals.h" #include <catch2/catch_totals.h>
#include "catch_timer.h" #include <catch2/catch_timer.h>
#include <string> #include <string>

Some files were not shown because too many files have changed in this diff Show More