Fix compilation on clang 19+

Author: toroidal-code

CMakeLists.txt

@@ -9,12 +9,16 @@ cmake_policy(SET CMP0135 NEW)
 include(FetchContent)
 
 FetchContent_Declare(argparse
-  URL https://github.com/p-ranav/argparse/archive/refs/tags/v3.0.tar.gz
+  GIT_REPOSITORY https://github.com/p-ranav/argparse/
+  GIT_TAG v3.1
+  GIT_SHALLOW 1
 )
 FetchContent_MakeAvailable(argparse)
 
 FetchContent_Declare(cxx-prettyprint
-  URL https://github.com/louisdx/cxx-prettyprint/archive/refs/heads/master.tar.gz
+  GIT_REPOSITORY https://github.com/louisdx/cxx-prettyprint/
+  GIT_TAG master
+  GIT_SHALLOW 1
 )
 FetchContent_MakeAvailable(cxx-prettyprint)
 
@@ -31,6 +35,7 @@ target_link_libraries(c++spec INTERFACE
   cxx-prettyprint
   argparse
 )
+target_compile_options(c++spec INTERFACE -Wno-missing-template-arg-list-after-template-kw)
 
 FILE(GLOB_RECURSE c++spec_headers ${CMAKE_CURRENT_LIST_DIR}/include/*.hpp)
 

include/child.hpp

@@ -9,10 +9,6 @@
 
 #pragma once
 
-#ifndef CPPSPEC_DEBUG
-#define CPPSPEC_DEBUG false
-#endif
-
 #include <iostream>
 #include <memory>
 #include <string>

include/matchers/errors/have_error.hpp

@@ -16,7 +16,9 @@ class HaveError : public MatcherBase<T, void *> {
  public:
   HaveError(Expectation<T> &expectation) : MatcherBase<T, void *>(expectation) {}
 
-  bool match() { return (!this->actual().has_value()); }
+  std::string description() override {return "have an error"; }
+
+  bool match() override { return (!this->actual().has_value()); }
 };
 
 template <expected T, typename E>

include/matchers/errors/have_value.hpp

@@ -15,15 +15,17 @@ class HaveValue : public MatcherBase<T, void *> {
  public:
   HaveValue(Expectation<T> &expectation) : MatcherBase<T, void *>(expectation) {}
 
-  bool match() { return (this->actual().has_value()); }
+  std::string description() override {return "have a value"; }
+
+  bool match() override { return (this->actual().has_value()); }
 };
 
 template <optional T, typename E>
-class HaveValueEqualTo : public MatcherBase<T, E> {
+class HaveValueEqualTo : public Equal<T, E> {
  public:
   static_assert(std::is_same_v<typename T::value_type, E>,
                 "the contained value_type must match the expected type");
-  HaveValueEqualTo(Expectation<T> &expectation, E expected) : MatcherBase<T, E>(expectation, expected) {}
+  HaveValueEqualTo(Expectation<T> &expectation, E expected) : Equal<T, E>(expectation, expected) {}
 
   bool match() { return (this->actual().value() == this->expected()); }
 };