diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp index b0a2c98e7..fae6b09ab 100644 --- a/src/fish_tests.cpp +++ b/src/fish_tests.cpp @@ -5711,16 +5711,16 @@ static void test_highlighting() { highlight_tests.push_back({ {L"echo", highlight_role_t::command}, {L"\\UFDFD", highlight_role_t::escape}, - }); + }); #if WCHAR_T_BITS > 16 highlight_tests.push_back({ {L"echo", highlight_role_t::command}, {L"\\U10FFFF", highlight_role_t::escape}, - }); + }); highlight_tests.push_back({ {L"echo", highlight_role_t::command}, {L"\\U110000", highlight_role_t::error}, - }); + }); #endif const auto saved_flags = fish_features(); mutable_fish_features().set(features_t::ampersand_nobg_in_token, true); diff --git a/src/maybe.h b/src/maybe.h index d122677d4..3c32d531c 100644 --- a/src/maybe.h +++ b/src/maybe.h @@ -138,8 +138,9 @@ class maybe_t : private maybe_detail::conditionally_copyable_t { // Not enabled if the type T is already bool-convertible to prevent accidental misuse, // otherwise the "typename std::enable_if<....>::type" evaluates to bool, giving us a definition // of `explicit operator bool() const { ... }` - template explicit operator - typename std::enable_if::value, bool>::type() const { + template + explicit operator typename std::enable_if::value, bool>::type() + const { return impl_.filled; }