diff --git a/examples/010-TestCase.cpp b/examples/010-TestCase.cpp index 9c676f82..8eaa1c0e 100644 --- a/examples/010-TestCase.cpp +++ b/examples/010-TestCase.cpp @@ -4,7 +4,7 @@ #include // And write tests in the same file: -#include +#include static int Factorial( int number ) { return number <= 1 ? number : Factorial( number - 1 ) * number; // fail diff --git a/examples/020-TestCase-1.cpp b/examples/020-TestCase-1.cpp index 76e25dad..c734d029 100644 --- a/examples/020-TestCase-1.cpp +++ b/examples/020-TestCase-1.cpp @@ -6,7 +6,7 @@ // Let Catch provide main(): #include -#include +#include TEST_CASE( "1: All test cases reside in other .cpp files (empty)", "[multi-file:1]" ) { } diff --git a/examples/020-TestCase-2.cpp b/examples/020-TestCase-2.cpp index 43c0aee0..3f5767b3 100644 --- a/examples/020-TestCase-2.cpp +++ b/examples/020-TestCase-2.cpp @@ -2,7 +2,7 @@ // main() provided by Catch in file 020-TestCase-1.cpp. -#include +#include static int Factorial( int number ) { return number <= 1 ? number : Factorial( number - 1 ) * number; // fail diff --git a/examples/030-Asn-Require-Check.cpp b/examples/030-Asn-Require-Check.cpp index 84935bbc..f638afae 100644 --- a/examples/030-Asn-Require-Check.cpp +++ b/examples/030-Asn-Require-Check.cpp @@ -10,7 +10,7 @@ // main() provided in 000-CatchMain.cpp -#include +#include static std::string one() { return "1"; diff --git a/examples/120-Bdd-ScenarioGivenWhenThen.cpp b/examples/120-Bdd-ScenarioGivenWhenThen.cpp index d1b9ce55..97336a70 100644 --- a/examples/120-Bdd-ScenarioGivenWhenThen.cpp +++ b/examples/120-Bdd-ScenarioGivenWhenThen.cpp @@ -2,7 +2,7 @@ // main() provided in 000-CatchMain.cpp -#include +#include SCENARIO( "vectors can be sized and resized", "[vector]" ) { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 27a6b58a..d9205d65 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,7 +35,6 @@ SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES}) set(INTERNAL_HEADERS ${SOURCES_DIR}/internal/catch_capture_matchers.h ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp - ${SOURCES_DIR}/catch.hpp ${SOURCES_DIR}/catch_approx.h ${SOURCES_DIR}/catch_assertionhandler.h ${SOURCES_DIR}/catch_assertioninfo.h diff --git a/src/catch2/catch.hpp b/src/catch2/catch.hpp deleted file mode 100644 index 352eae25..00000000 --- a/src/catch2/catch.hpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Created by Phil on 22/10/2010. - * Copyright 2010 Two Blue Cubes Ltd - * - * 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) - */ - -#ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED -#define TWOBLUECUBES_CATCH_HPP_INCLUDED - -#include - -#include - -#if !defined(CATCH_CONFIG_IMPL_ONLY) -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -// These files are included here so the single_include script doesn't put them -// in the conditionally compiled sections -#include -#include - -#ifdef __OBJC__ -#include -#endif - -#endif // ! CATCH_CONFIG_IMPL_ONLY - -#if !defined(CATCH_CONFIG_IMPL_ONLY) - -#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED -# undef CLARA_CONFIG_MAIN -#endif - -#include - -#endif // ! CATCH_CONFIG_IMPL_ONLY - -#include - -#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED diff --git a/tests/SelfTest/UsageTests/ToStringVector.tests.cpp b/tests/SelfTest/UsageTests/ToStringVector.tests.cpp index 5ce2ff75..96c67672 100644 --- a/tests/SelfTest/UsageTests/ToStringVector.tests.cpp +++ b/tests/SelfTest/UsageTests/ToStringVector.tests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include