From 74c2bb33858f07d3bef07cb3185071dbf81b101f Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 30 Jun 2022 05:45:23 -0400 Subject: [PATCH] Catch2 to 3.x again? fix merge issue --- 3rdparty/Catch2 | 2 +- common/bspfile.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/Catch2 b/3rdparty/Catch2 index 62fd6605..5a1ef7e4 160000 --- a/3rdparty/Catch2 +++ b/3rdparty/Catch2 @@ -1 +1 @@ -Subproject commit 62fd660583d3ae7a7886930b413c3c570e89786c +Subproject commit 5a1ef7e4a6caf3d5f696eb82302e3d87ff5c2303 diff --git a/common/bspfile.cc b/common/bspfile.cc index 4c5a0054..8914ccca 100644 --- a/common/bspfile.cc +++ b/common/bspfile.cc @@ -97,8 +97,7 @@ public: return (flags.native & ~TEX_SPECIAL) == 0; } - bool texinfo_is_hintskip(const surfflags_t &flags, const std::string &name) const override - int32_t surfflags_from_string(const std::string_view &str) const + int32_t surfflags_from_string(const std::string_view &str) const override { if (string_iequals(str, "special")) { return TEX_SPECIAL; @@ -107,7 +106,8 @@ public: return 0; } - bool texinfo_is_hintskip(const surfflags_t &flags, const std::string &name) const override { + bool texinfo_is_hintskip(const surfflags_t &flags, const std::string &name) const override + { // anything texname other than "hint" in a hint brush is treated as "hintskip", and discarded return !string_iequals(name, "hint"); }