Merge pull request #26 from Progmasoft/chore/cpp17-descriptions

Say C++17 everywhere the project describes itself

3 files changed, 4 insertions, 5 deletions

diff --git a/src/Progmasoft/Catch3/Internal/Decomposer.hpp b/src/Progmasoft/Catch3/Internal/Decomposer.hpp
index 77a4a123..4c57d3be 100644
--- a/src/Progmasoft/Catch3/Internal/Decomposer.hpp
+++ b/src/Progmasoft/Catch3/Internal/Decomposer.hpp
@@ -128,7 +128,7 @@
 namespace Catch {
 
     namespace Detail {
-        // This was added in C++20, but we require only C++14 for now.
+        // This was added in C++20, but we require only C++17.
         template <typename T>
         using RemoveCVRef_t = std::remove_cv_t<std::remove_reference_t<T>>;
     }
diff --git a/src/Progmasoft/Catch3/meson.build b/src/Progmasoft/Catch3/meson.build
index b8d38908..7b75dc6d 100644
--- a/src/Progmasoft/Catch3/meson.build
+++ b/src/Progmasoft/Catch3/meson.build
@@ -347,8 +347,7 @@ if ((host_machine.system() == 'android') or
   catch3_dependencies += log_dep
 endif
 
-# Code that includes the engine's headers needs C++14, and the other
-# Progmasoft/ headers C++20; the library itself, with the runner, is built as C++20.
+# The library, and the code that includes its headers, need C++17.
 catch3 = static_library(
   'Catch3',
   sources,
@@ -368,7 +367,7 @@ if get_option('install')
   pkg.generate(
     catch3,
     filebase: 'catch3',
-    description: 'A C++ test framework with a Catch2-compatible API; headers need C++14 and above',
+    description: 'A C++ test framework with a Catch2-compatible API; headers need C++17 and above',
     url: 'https://github.com/Progmasoft/catch3',
   )
 endif
diff --git a/src/Progmasoft/Runner/.clang-format b/src/Progmasoft/Runner/.clang-format
index 1063b9ea..2cdf8220 100644
--- a/src/Progmasoft/Runner/.clang-format
+++ b/src/Progmasoft/Runner/.clang-format
@@ -1,7 +1,7 @@
 ---
 Language: Cpp
 BasedOnStyle: LLVM
-Standard: c++20
+Standard: c++17
 
 UseTab: Never
 IndentWidth: 4