try

rollbear · Aug 23, 2023 · 357a335 · 357a335
1 parent 8f55f53
commit 357a335
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/include/trompeloeil/mock.hpp b/include/trompeloeil/mock.hpp
@@ -1044,7 +1044,7 @@ struct illegal_argument
 };
 
 struct matcher { };
-
+template <int...> class PPP;
 struct wildcard : public matcher
 {
   template <typename T>
@@ -1067,7 +1067,7 @@ struct wildcard : public matcher
   operator T&&() const
   {
 #if (!TROMPELOEIL_GCC  || TROMPELOEIL_GCC_VERSION < 60000 || TROMPELOEIL_GCC_VERSION >= 90000) \
-      && (!TROMPELOEIL_CLANG || TROMPELOEIL_CLANG_VERSION >= 40000 || !defined(_LIBCPP_STD_VER) || _LIBCPP_STD_VER != 14)
+      && (!TROMPELOEIL_CLANG || (TROMPELOEIL_CLANG_VERSION >= 40000 && (!defined(_LIBCPP_STD_VER) || _LIBCPP_STD_VER != 14)))
     return wrapper<T &&>{};
 #else
     return *this;

diff --git a/test/compare_tests_11.cpp b/test/compare_tests_11.cpp
@@ -1,3 +1,4 @@
+#define TROMPELOEIL_SANITY_CHECKS
 #include <trompeloeil/matcher/compare.hpp>
 #include "compiling_tests.hpp"
 

diff --git a/test/compare_tests_14.cpp b/test/compare_tests_14.cpp
@@ -1,7 +1,8 @@
+#define TROMPELOEIL_SANITY_CHECKS
 #include <trompeloeil/matcher/compare.hpp>
-#include "compiling_tests.hpp"
 
 #if TROMPELOEIL_CPLUSPLUS > 201103L
+#include "compiling_tests.hpp"
 
 #if defined(CATCH2_VERSION) && CATCH2_VERSION == 3
 #include <catch2/catch_test_macros.hpp>

diff --git a/test/compiling_tests.hpp b/test/compiling_tests.hpp
@@ -23,8 +23,6 @@ struct QCharIsh {
 constexpr bool operator==(std::nullptr_t,QCharIsh) noexcept;
 constexpr bool operator==(QCharIsh,std::nullptr_t) noexcept;
 
-#define TROMPELOEIL_SANITY_CHECKS
-
 #include <algorithm>
 #include <cstddef>
 #include <memory>

diff --git a/test/compiling_tests_11.cpp b/test/compiling_tests_11.cpp
@@ -12,7 +12,8 @@
  * Project home: https://github.com/rollbear/trompeloeil
  */
 
-#include "trompeloeil.hpp"
+#define TROMPELOEIL_SANITY_CHECKS
+#include <trompeloeil.hpp>
 #include "compiling_tests.hpp"
 
 #if defined(CATCH2_VERSION) && CATCH2_VERSION == 3
@@ -21,6 +22,8 @@
 #include <catch2/catch.hpp>
 #endif
 
+#include <algorithm>
+#include <cstddef>
 #include <iostream>
 #include <map>
 #include <memory>

diff --git a/test/compiling_tests_14.cpp b/test/compiling_tests_14.cpp
@@ -12,7 +12,10 @@
  * Project home: https://github.com/rollbear/trompeloeil
  */
 
+#define TROMPELOEIL_SANITY_CHECKS
 #include <trompeloeil.hpp>
+
+#if TROMPELOEIL_CPLUSPLUS > 201103L
 #include "compiling_tests.hpp"
 
 #if defined(CATCH2_VERSION) && CATCH2_VERSION == 3
@@ -33,7 +36,6 @@
 #include <vector>
 
 
-#if TROMPELOEIL_CPLUSPLUS > 201103L
 
 // Exercise C++14 Trompeloeil interface
 

diff --git a/test/regex_tests_11.cpp b/test/regex_tests_11.cpp
@@ -1,3 +1,4 @@
+#define TROMPELOEIL_SANITY_CHECKS
 #include <trompeloeil/matcher/re.hpp>
 #include "compiling_tests.hpp"
 

diff --git a/test/regex_tests_14.cpp b/test/regex_tests_14.cpp
@@ -1,7 +1,8 @@
+#define TROMPELOEIL_SANITY_CHECKS
 #include <trompeloeil/matcher/re.hpp>
-#include "compiling_tests.hpp"
 
 #if TROMPELOEIL_CPLUSPLUS > 201103L
+#include "compiling_tests.hpp"
 
 #if defined(CATCH2_VERSION) && CATCH2_VERSION == 3
 #include <catch2/catch_test_macros.hpp>