Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-11-30 12:32:10 +0100
committerMartin Hořeňovský2019-11-30 17:13:22 +0100
commit7c6de33977af2c3fc38d0a8904b12221114041be (patch)
tree951b94063eec8e5f87c811d7f98a1b0bd4cd56f0
parente1a43b5b0f317be6877e7ce4d1d02a5953b9c560 (diff)
downloadcatch3-7c6de33977af2c3fc38d0a8904b12221114041be.tar.gz
Fixed up include paths
-rw-r--r--src/catch.hpp46
-rw-r--r--src/catch_clara.h2
-rw-r--r--src/catch_external_interfaces.h10
-rw-r--r--src/catch_interfaces_reporter.cpp2
-rw-r--r--src/catch_session.cpp2
-rw-r--r--src/reporters/catch_reporter_bases.cpp4
-rw-r--r--src/reporters/catch_reporter_bases.hpp4
-rw-r--r--src/reporters/catch_reporter_compact.cpp4
-rw-r--r--src/reporters/catch_reporter_console.cpp10
-rw-r--r--src/reporters/catch_reporter_junit.cpp6
-rw-r--r--src/reporters/catch_reporter_junit.h4
-rw-r--r--src/reporters/catch_reporter_listening.h2
-rw-r--r--src/reporters/catch_reporter_xml.cpp6
-rw-r--r--src/reporters/catch_reporter_xml.h4
14 files changed, 53 insertions, 53 deletions
diff --git a/src/catch.hpp b/src/catch.hpp
index 422f8a53..fdaccec8 100644
--- a/src/catch.hpp
+++ b/src/catch.hpp
@@ -19,7 +19,7 @@
# pragma GCC system_header
#endif
-#include "internal/catch_suppress_warnings.h"
+#include "catch_suppress_warnings.h"
#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
# define CATCH_IMPL
@@ -39,7 +39,7 @@
#endif
#if !defined(CATCH_CONFIG_IMPL_ONLY)
-#include "internal/catch_platform.h"
+#include "catch_platform.h"
#ifdef CATCH_IMPL
# ifndef CLARA_CONFIG_MAIN
@@ -48,49 +48,49 @@
# endif
#endif
-#include "internal/catch_user_interfaces.h"
-#include "internal/catch_tag_alias_autoregistrar.h"
-#include "internal/catch_test_registry.h"
-#include "internal/catch_capture.hpp"
-#include "internal/catch_section.h"
-#include "internal/catch_interfaces_exception.h"
-#include "internal/catch_approx.h"
-#include "internal/catch_compiler_capabilities.h"
-#include "internal/catch_string_manip.h"
+#include "catch_user_interfaces.h"
+#include "catch_tag_alias_autoregistrar.h"
+#include "catch_test_registry.h"
+#include "catch_capture.hpp"
+#include "catch_section.h"
+#include "catch_interfaces_exception.h"
+#include "catch_approx.h"
+#include "catch_compiler_capabilities.h"
+#include "catch_string_manip.h"
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-#include "internal/catch_capture_matchers.h"
+#include "catch_capture_matchers.h"
#endif
-#include "internal/catch_generators.hpp"
-#include "internal/catch_generators_generic.hpp"
-#include "internal/catch_generators_specific.hpp"
+#include "catch_generators.hpp"
+#include "catch_generators_generic.hpp"
+#include "catch_generators_specific.hpp"
// These files are included here so the single_include script doesn't put them
// in the conditionally compiled sections
-#include "internal/catch_test_case_info.h"
-#include "internal/catch_interfaces_runner.h"
+#include "catch_test_case_info.h"
+#include "catch_interfaces_runner.h"
#ifdef __OBJC__
-#include "internal/catch_objc.hpp"
+#include "catch_objc.hpp"
#endif
// Benchmarking needs the externally-facing parts of reporters to work
#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#include "internal/catch_external_interfaces.h"
+#include "catch_external_interfaces.h"
#endif
#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#include "internal/benchmark/catch_benchmark.hpp"
+#include "benchmark/catch_benchmark.hpp"
#endif
#endif // ! CATCH_CONFIG_IMPL_ONLY
#ifdef CATCH_IMPL
-#include "internal/catch_impl.hpp"
+#include "catch_impl.hpp"
#endif
#ifdef CATCH_CONFIG_MAIN
-#include "internal/catch_default_main.hpp"
+#include "catch_default_main.hpp"
#endif
@@ -485,6 +485,6 @@ using Catch::Detail::Approx;
#endif // ! CATCH_CONFIG_IMPL_ONLY
-#include "internal/catch_reenable_warnings.h"
+#include "catch_reenable_warnings.h"
#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED
diff --git a/src/catch_clara.h b/src/catch_clara.h
index bdf70250..e5275747 100644
--- a/src/catch_clara.h
+++ b/src/catch_clara.h
@@ -23,7 +23,7 @@
#pragma clang diagnostic ignored "-Wshadow"
#endif
-#include "../external/clara.hpp"
+#include "external/clara.hpp"
#ifdef __clang__
#pragma clang diagnostic pop
diff --git a/src/catch_external_interfaces.h b/src/catch_external_interfaces.h
index d0254945..27e7b5c5 100644
--- a/src/catch_external_interfaces.h
+++ b/src/catch_external_interfaces.h
@@ -7,14 +7,14 @@
#ifndef TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
#define TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
-#include "../reporters/catch_reporter_bases.hpp"
+#include "reporters/catch_reporter_bases.hpp"
#include "catch_console_colour.h"
#include "catch_reporter_registrars.hpp"
// Allow users to base their work off existing reporters
-#include "../reporters/catch_reporter_compact.h"
-#include "../reporters/catch_reporter_console.h"
-#include "../reporters/catch_reporter_junit.h"
-#include "../reporters/catch_reporter_xml.h"
+#include "reporters/catch_reporter_compact.h"
+#include "reporters/catch_reporter_console.h"
+#include "reporters/catch_reporter_junit.h"
+#include "reporters/catch_reporter_xml.h"
#endif // TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
diff --git a/src/catch_interfaces_reporter.cpp b/src/catch_interfaces_reporter.cpp
index 7005ce0b..e48b950e 100644
--- a/src/catch_interfaces_reporter.cpp
+++ b/src/catch_interfaces_reporter.cpp
@@ -7,7 +7,7 @@
#include "catch_interfaces_reporter.h"
#include "catch_console_colour.h"
-#include "../reporters/catch_reporter_listening.h"
+#include "reporters/catch_reporter_listening.h"
#include "catch_list.h"
#include "catch_text.h"
diff --git a/src/catch_session.cpp b/src/catch_session.cpp
index a4d5c016..3c52b7a7 100644
--- a/src/catch_session.cpp
+++ b/src/catch_session.cpp
@@ -21,7 +21,7 @@
#include "catch_text.h"
#include "catch_stream.h"
#include "catch_windows_h_proxy.h"
-#include "../reporters/catch_reporter_listening.h"
+#include "reporters/catch_reporter_listening.h"
#include <cstdlib>
#include <iomanip>
diff --git a/src/reporters/catch_reporter_bases.cpp b/src/reporters/catch_reporter_bases.cpp
index 79427283..19ba7df9 100644
--- a/src/reporters/catch_reporter_bases.cpp
+++ b/src/reporters/catch_reporter_bases.cpp
@@ -6,8 +6,8 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
-#include "../internal/catch_interfaces_reporter.h"
-#include "../internal/catch_errno_guard.h"
+#include "../catch_interfaces_reporter.h"
+#include "../catch_errno_guard.h"
#include "catch_reporter_bases.hpp"
#include <cstring>
diff --git a/src/reporters/catch_reporter_bases.hpp b/src/reporters/catch_reporter_bases.hpp
index 5925d8bb..5d3980ac 100644
--- a/src/reporters/catch_reporter_bases.hpp
+++ b/src/reporters/catch_reporter_bases.hpp
@@ -8,8 +8,8 @@
#ifndef TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
-#include "../internal/catch_enforce.h"
-#include "../internal/catch_interfaces_reporter.h"
+#include "../catch_enforce.h"
+#include "../catch_interfaces_reporter.h"
#include <algorithm>
#include <cstring>
diff --git a/src/reporters/catch_reporter_compact.cpp b/src/reporters/catch_reporter_compact.cpp
index 017f521f..705144b1 100644
--- a/src/reporters/catch_reporter_compact.cpp
+++ b/src/reporters/catch_reporter_compact.cpp
@@ -7,8 +7,8 @@
#include "catch_reporter_compact.h"
-#include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_console_colour.h"
+#include "../catch_reporter_registrars.hpp"
+#include "../catch_console_colour.h"
namespace {
diff --git a/src/reporters/catch_reporter_console.cpp b/src/reporters/catch_reporter_console.cpp
index be00d0bd..2d1dbdfa 100644
--- a/src/reporters/catch_reporter_console.cpp
+++ b/src/reporters/catch_reporter_console.cpp
@@ -8,11 +8,11 @@
#include "catch_reporter_console.h"
-#include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_console_colour.h"
-#include "../internal/catch_version.h"
-#include "../internal/catch_text.h"
-#include "../internal/catch_stringref.h"
+#include "../catch_reporter_registrars.hpp"
+#include "../catch_console_colour.h"
+#include "../catch_version.h"
+#include "../catch_text.h"
+#include "../catch_stringref.h"
#include <cfloat>
#include <cstdio>
diff --git a/src/reporters/catch_reporter_junit.cpp b/src/reporters/catch_reporter_junit.cpp
index 27f7c1c1..22ae4b37 100644
--- a/src/reporters/catch_reporter_junit.cpp
+++ b/src/reporters/catch_reporter_junit.cpp
@@ -10,9 +10,9 @@
#include "catch_reporter_junit.h"
-#include "../internal/catch_tostring.h"
-#include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_text.h"
+#include "../catch_tostring.h"
+#include "../catch_reporter_registrars.hpp"
+#include "../catch_text.h"
#include <cassert>
#include <sstream>
diff --git a/src/reporters/catch_reporter_junit.h b/src/reporters/catch_reporter_junit.h
index c7657d18..2475b4ab 100644
--- a/src/reporters/catch_reporter_junit.h
+++ b/src/reporters/catch_reporter_junit.h
@@ -9,8 +9,8 @@
#include "catch_reporter_bases.hpp"
-#include "../internal/catch_xmlwriter.h"
-#include "../internal/catch_timer.h"
+#include "../catch_xmlwriter.h"
+#include "../catch_timer.h"
namespace Catch {
diff --git a/src/reporters/catch_reporter_listening.h b/src/reporters/catch_reporter_listening.h
index 60a44a79..828a1a04 100644
--- a/src/reporters/catch_reporter_listening.h
+++ b/src/reporters/catch_reporter_listening.h
@@ -7,7 +7,7 @@
#ifndef TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
#define TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
-#include "../internal/catch_interfaces_reporter.h"
+#include "../catch_interfaces_reporter.h"
namespace Catch {
diff --git a/src/reporters/catch_reporter_xml.cpp b/src/reporters/catch_reporter_xml.cpp
index d9a3cef3..212b02f6 100644
--- a/src/reporters/catch_reporter_xml.cpp
+++ b/src/reporters/catch_reporter_xml.cpp
@@ -8,9 +8,9 @@
#include "catch_reporter_xml.h"
-#include "../internal/catch_capture.hpp"
-#include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_list.h"
+#include "../catch_capture.hpp"
+#include "../catch_reporter_registrars.hpp"
+#include "../catch_list.h"
#if defined(_MSC_VER)
#pragma warning(push)
diff --git a/src/reporters/catch_reporter_xml.h b/src/reporters/catch_reporter_xml.h
index 8b256fe5..97867da8 100644
--- a/src/reporters/catch_reporter_xml.h
+++ b/src/reporters/catch_reporter_xml.h
@@ -9,8 +9,8 @@
#include "catch_reporter_bases.hpp"
-#include "../internal/catch_xmlwriter.h"
-#include "../internal/catch_timer.h"
+#include "../catch_xmlwriter.h"
+#include "../catch_timer.h"
namespace Catch {