Changed all .hpp extensions to .h where there is now a corresponding .cpp

include/catch.hpp

@@ -35,12 +35,12 @@
 #endif
 
 #include "internal/catch_tag_alias_autoregistrar.h"
-#include "internal/catch_test_registry.hpp"
+#include "internal/catch_test_registry.h"
 #include "internal/catch_capture.hpp"
 #include "internal/catch_section.h"
 #include "internal/catch_benchmark.h"
 #include "internal/catch_interfaces_exception.h"
-#include "internal/catch_approx.hpp"
+#include "internal/catch_approx.h"
 #include "internal/catch_compiler_capabilities.h"
 #include "internal/catch_string_manip.h"
 

include/internal/catch_approx.cpp

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

include/internal/catch_capture_matchers.h

@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
 
 #include "catch_capture.hpp"
-#include "catch_matchers.hpp"
+#include "catch_matchers.h"
 #include "catch_matchers_string.h"
 #include "catch_matchers_vector.h"
 

include/internal/catch_commandline.cpp

@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_commandline.hpp"
+#include "catch_commandline.h"
 
 #include "catch_string_manip.h"
 

include/internal/catch_config.hpp

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
 
-#include "catch_test_spec_parser.hpp"
+#include "catch_test_spec_parser.h"
 #include "catch_interfaces_config.h"
 
 // Libstdc++ doesn't like incomplete classes for unique_ptr

include/internal/catch_console_colour.cpp

@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_console_colour.hpp"
+#include "catch_console_colour.h"
 #include "catch_enforce.h"
 #include "catch_errno_guard.h"
 #include "catch_interfaces_config.h"

include/internal/catch_external_interfaces.h

@@ -8,7 +8,7 @@
 #define TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
 
 #include "../reporters/catch_reporter_bases.hpp"
-#include "catch_console_colour.hpp"
+#include "catch_console_colour.h"
 #include "catch_reporter_registrars.hpp"
 
 #endif // TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED

include/internal/catch_impl.hpp

@@ -19,8 +19,8 @@
 
 #include "internal/catch_leak_detector.h"
 
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
-#include "catch_test_case_tracker.hpp"
+#include "catch_test_case_tracker.h"
 
 // Cpp files will be included in the single-header file here
 // ~*~* CATCH_CPP_STITCH_PLACE *~*~

include/internal/catch_interfaces_reporter.h

@@ -11,7 +11,7 @@
 #include "catch_section_info.h"
 #include "catch_common.h"
 #include "catch_config.hpp"
-#include "catch_totals.hpp"
+#include "catch_totals.h"
 #include "catch_test_case_info.h"
 #include "catch_assertionresult.h"
 #include "catch_message.h"

include/internal/catch_list.cpp

@@ -15,8 +15,8 @@
 #include "catch_stream.h"
 #include "catch_text.h"
 
-#include "catch_console_colour.hpp"
+#include "catch_console_colour.h"
-#include "catch_test_spec_parser.hpp"
+#include "catch_test_spec_parser.h"
 #include "catch_tostring.h"
 #include "catch_string_manip.h"
 

include/internal/catch_matchers.cpp

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

include/internal/catch_matchers_string.h

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

include/internal/catch_matchers_vector.h

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
 
-#include "catch_matchers.hpp"
+#include "catch_matchers.h"
 
 namespace Catch {
 namespace Matchers {

include/internal/catch_registry_hub.cpp

@@ -9,7 +9,7 @@
 #include "catch_interfaces_registry_hub.h"
 
 #include "catch_context.h"
-#include "catch_test_case_registry_impl.hpp"
+#include "catch_test_case_registry_impl.h"
 #include "catch_reporter_registry.hpp"
 #include "catch_exception_translator_registry.h"
 #include "catch_tag_alias_registry.h"

include/internal/catch_run_context.cpp

@@ -1,4 +1,4 @@
-#include "catch_run_context.hpp"
+#include "catch_run_context.h"
 #include "catch_context.h"
 #include "catch_enforce.h"
 #include "catch_random_number_generator.h"

include/internal/catch_run_context.h

@@ -12,12 +12,12 @@
 #include "catch_interfaces_reporter.h"
 #include "catch_interfaces_exception.h"
 #include "catch_config.hpp"
-#include "catch_test_registry.hpp"
+#include "catch_test_registry.h"
 #include "catch_test_case_info.h"
 #include "catch_capture.hpp"
-#include "catch_totals.hpp"
+#include "catch_totals.h"
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
-#include "catch_test_case_tracker.hpp"
+#include "catch_test_case_tracker.h"
 #include "catch_timer.h"
 #include "catch_assertionhandler.h"
 #include "catch_fatal_condition.h"

include/internal/catch_section.h

@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
 
 #include "catch_section_info.h"
-#include "catch_totals.hpp"
+#include "catch_totals.h"
 #include "catch_timer.h"
 
 #include <string>

include/internal/catch_section_info.h

@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
 
 #include "catch_common.h"
-#include "catch_totals.hpp"
+#include "catch_totals.h"
 
 #include <string>
 

include/internal/catch_session.cpp

@@ -6,13 +6,13 @@
  */
 
 #include "catch_session.h"
-#include "catch_commandline.hpp"
+#include "catch_commandline.h"
-#include "catch_console_colour.hpp"
+#include "catch_console_colour.h"
 #include "catch_enforce.h"
 #include "catch_list.h"
-#include "catch_run_context.hpp"
+#include "catch_run_context.h"
 #include "catch_stream.h"
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_version.h"
 #include "catch_interfaces_reporter.h"
 #include "catch_random_number_generator.h"

include/internal/catch_session.h

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
 
-#include "catch_commandline.hpp"
+#include "catch_commandline.h"
 #include "catch_config.hpp"
 #include "catch_text.h"
 

include/internal/catch_tag_alias_registry.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "catch_tag_alias_registry.h"
-#include "catch_console_colour.hpp"
+#include "catch_console_colour.h"
 #include "catch_enforce.h"
 #include "catch_interfaces_registry_hub.h"
 #include "catch_stream.h"

include/internal/catch_test_case_info.cpp

@@ -8,7 +8,7 @@
 
 #include "catch_test_case_info.h"
 #include "catch_enforce.h"
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_interfaces_testcase.h"
 #include "catch_string_manip.h"
 

include/internal/catch_test_case_registry_impl.cpp

@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_case_registry_impl.hpp"
+#include "catch_test_case_registry_impl.h"
 
 #include "catch_context.h"
 #include "catch_enforce.h"

include/internal/catch_test_case_registry_impl.h

@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 
-#include "catch_test_registry.hpp"
+#include "catch_test_registry.h"
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_interfaces_config.h"
 
 #include <vector>

include/internal/catch_test_case_tracker.cpp

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

include/internal/catch_test_registry.cpp

@@ -5,8 +5,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_registry.hpp"
+#include "catch_test_registry.h"
-#include "catch_test_case_registry_impl.hpp"
+#include "catch_test_case_registry_impl.h"
 #include "catch_interfaces_registry_hub.h"
 
 namespace Catch {

include/internal/catch_test_spec.cpp

@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_string_manip.h"
 
 #include <algorithm>

include/internal/catch_test_spec.h

@@ -13,7 +13,7 @@
 #pragma clang diagnostic ignored "-Wpadded"
 #endif
 
-#include "catch_wildcard_pattern.hpp"
+#include "catch_wildcard_pattern.h"
 #include "catch_test_case_info.h"
 
 #include <string>

include/internal/catch_test_spec_parser.cpp

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

include/internal/catch_test_spec_parser.h

@@ -13,7 +13,7 @@
 #pragma clang diagnostic ignored "-Wpadded"
 #endif
 
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_string_manip.h"
 #include "catch_interfaces_tag_alias_registry.h"
 

include/internal/catch_totals.cpp

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

include/internal/catch_wildcard_pattern.cpp

@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_wildcard_pattern.hpp"
+#include "catch_wildcard_pattern.h"
 #include "catch_enforce.h"
 #include "catch_string_manip.h"
 

include/internal/catch_xmlwriter.cpp

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

include/reporters/catch_reporter_compact.cpp

@@ -9,7 +9,7 @@
 #include "catch_reporter_bases.hpp"
 
 #include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_console_colour.hpp"
+#include "internal/catch_console_colour.h"
 
 namespace {
 

include/reporters/catch_reporter_console.cpp

@@ -9,7 +9,7 @@
 #include "catch_reporter_bases.hpp"
 
 #include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_console_colour.hpp"
+#include "internal/catch_console_colour.h"
 #include "../internal/catch_version.h"
 #include "../internal/catch_text.h"
 #include "../internal/catch_stringref.h"

include/reporters/catch_reporter_junit.cpp

@@ -10,7 +10,7 @@
 
 #include "../internal/catch_tostring.h"
 #include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.h"
 #include "../internal/catch_timer.h"
 
 #include <assert.h>

include/reporters/catch_reporter_xml.cpp

@@ -10,7 +10,7 @@
 
 #include "../internal/catch_capture.hpp"
 #include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.h"
 #include "../internal/catch_timer.h"
 
 namespace Catch {

projects/SelfTest/CmdLineTests.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "catch.hpp"
-#include "internal/catch_test_spec_parser.hpp"
+#include "internal/catch_test_spec_parser.h"
 
 #ifdef __clang__
 #   pragma clang diagnostic ignored "-Wc++98-compat"

projects/SelfTest/MiscTests.cpp

@@ -13,7 +13,7 @@
 #   pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
 #endif
 
-#include "../include/internal/catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.h"
 
 #include <iostream>
 #include <cerrno>

projects/SelfTest/PartTrackerTests.cpp

@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 #include "internal/catch_suppress_warnings.h"
-#include "internal/catch_test_case_tracker.hpp"
+#include "internal/catch_test_case_tracker.h"
 
 
 namespace Catch

projects/SelfTest/SurrogateCpps/catch_console_colour.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
 #include "internal/catch_suppress_warnings.h"
-#include "internal/catch_console_colour.hpp"
+#include "internal/catch_console_colour.h"

projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp

@@ -1,2 +1,2 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "internal/catch_test_case_tracker.hpp"
+#include "internal/catch_test_case_tracker.h"

projects/SelfTest/SurrogateCpps/catch_test_spec.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
 #include "internal/catch_suppress_warnings.h"
-#include "internal/catch_test_spec.hpp"
+#include "internal/catch_test_spec.h"

projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp

@@ -1,4 +1,4 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
 #include "internal/catch_suppress_warnings.h"
-#include "internal/catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.h"
 #include "internal/catch_reenable_warnings.h"