Merge remote-tracking branch 'origin/main' into dev/lhecker/8000-IInp…

…utEvent-exorcism
microsoft · Aug 11, 2023 · 793d290 · 793d290
2 parents b1e2810 + e9c8391
commit 793d290
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/buffer/out/Row.cpp b/src/buffer/out/Row.cpp
@@ -4,6 +4,7 @@
 #include "precomp.h"
 #include "Row.hpp"
 
+#include <isa_availability.h>
 #include <til/unicode.h>
 
 #include "textBuffer.hpp"

diff --git a/src/cascadia/UnitTests_TerminalCore/TilWinRtHelpersTests.cpp b/src/cascadia/UnitTests_TerminalCore/TilWinRtHelpersTests.cpp
@@ -81,23 +81,23 @@ void TilWinRtHelpersTests::TestTruthiness()
     til::property<winrt::hstring> FullString{ L"Full" };
 
     VERIFY_IS_FALSE(Foo());
-    VERIFY_IS_FALSE(Foo);
+    VERIFY_IS_FALSE((bool)Foo);
 
     VERIFY_IS_FALSE(Bar());
-    VERIFY_IS_FALSE(Bar);
+    VERIFY_IS_FALSE((bool)Bar);
 
-    VERIFY_IS_FALSE(EmptyString);
+    VERIFY_IS_FALSE((bool)EmptyString);
     VERIFY_IS_FALSE(!EmptyString().empty());
 
     Foo(true);
     VERIFY_IS_TRUE(Foo());
-    VERIFY_IS_TRUE(Foo);
+    VERIFY_IS_TRUE((bool)Foo);
 
     Bar(11);
     VERIFY_IS_TRUE(Bar());
-    VERIFY_IS_TRUE(Bar);
+    VERIFY_IS_TRUE((bool)Bar);
 
-    VERIFY_IS_TRUE(FullString);
+    VERIFY_IS_TRUE((bool)FullString);
     VERIFY_IS_TRUE(!FullString().empty());
 }
 
@@ -177,13 +177,13 @@ void TilWinRtHelpersTests::TestComposedConstProperties()
     const struct Helper noTouching;
 
     VERIFY_ARE_EQUAL(0, changeMe.Foo());
-    VERIFY_ARE_EQUAL(3, changeMe.Composed().first);
-    VERIFY_ARE_EQUAL(2, changeMe.Composed().second);
+    VERIFY_ARE_EQUAL(3, changeMe.Composed().first());
+    VERIFY_ARE_EQUAL(2, changeMe.Composed().second());
     VERIFY_ARE_EQUAL(L"", changeMe.MyString());
 
     VERIFY_ARE_EQUAL(0, noTouching.Foo());
-    VERIFY_ARE_EQUAL(3, noTouching.Composed().first);
-    VERIFY_ARE_EQUAL(2, noTouching.Composed().second);
+    VERIFY_ARE_EQUAL(3, noTouching.Composed().first());
+    VERIFY_ARE_EQUAL(2, noTouching.Composed().second());
     VERIFY_ARE_EQUAL(L"", noTouching.MyString());
 
     changeMe.Foo(42);

diff --git a/src/inc/til/winrt.h b/src/inc/til/winrt.h
@@ -21,7 +21,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
         {
             _value = std::forward<decltype(arg)>(arg);
         }
-        operator bool() const noexcept
+        explicit operator bool() const noexcept
         {
             if constexpr (std::is_same_v<T, winrt::hstring>)
             {