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

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-05-09 19:33:47 +0200
committerMartin Hořeňovský2020-05-09 19:40:57 +0200
commite1a0cce82b0ea3a37b00b3d7e6ec02be42ce1891 (patch)
treecde46a8c67cd80ba8f4f93e056acacff3a438279 /src
parent75b711a36061f5ddd2516f937a5c9bc44ef9ae8f (diff)
downloadcatch3-e1a0cce82b0ea3a37b00b3d7e6ec02be42ce1891.tar.gz
Remove Clara from external folder
As Clara is no longer maintained as a separate project, the implementation was moved to the internal subfolder of top-level folder. This removes one folder and avoids potential user confusion. Also simplified the convenience header checking script accordingly.
Diffstat (limited to 'src')
-rw-r--r--src/catch2/catch_all.hpp2
-rw-r--r--src/catch2/internal/catch_clara.hpp2
-rw-r--r--src/catch2/internal/catch_clara_upstream.hpp (renamed from src/catch2/external/clara.hpp)0
3 files changed, 2 insertions, 2 deletions
diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp
index 5c6b09d2..0cc9550d 100644
--- a/src/catch2/catch_all.hpp
+++ b/src/catch2/catch_all.hpp
@@ -36,11 +36,11 @@
#include <catch2/catch_totals.hpp>
#include <catch2/catch_version.hpp>
#include <catch2/catch_version_macros.hpp>
-#include <catch2/external/catch_external_all.hpp>
#include <catch2/generators/catch_generators_all.hpp>
#include <catch2/interfaces/catch_interfaces_all.hpp>
#include <catch2/internal/catch_assertionhandler.hpp>
#include <catch2/internal/catch_clara.hpp>
+#include <catch2/internal/catch_clara_upstream.hpp>
#include <catch2/internal/catch_commandline.hpp>
#include <catch2/internal/catch_common.hpp>
#include <catch2/internal/catch_compiler_capabilities.hpp>
diff --git a/src/catch2/internal/catch_clara.hpp b/src/catch2/internal/catch_clara.hpp
index 35494929..372daa2a 100644
--- a/src/catch2/internal/catch_clara.hpp
+++ b/src/catch2/internal/catch_clara.hpp
@@ -23,7 +23,7 @@
#pragma clang diagnostic ignored "-Wshadow"
#endif
-#include <catch2/external/clara.hpp>
+#include <catch2/internal/catch_clara_upstream.hpp>
#ifdef __clang__
#pragma clang diagnostic pop
diff --git a/src/catch2/external/clara.hpp b/src/catch2/internal/catch_clara_upstream.hpp
index c7348bf9..c7348bf9 100644
--- a/src/catch2/external/clara.hpp
+++ b/src/catch2/internal/catch_clara_upstream.hpp