diff --git a/strings/base_coroutine_foundation.h b/strings/base_coroutine_foundation.h index 71dbb0043..31ec1bcc4 100644 --- a/strings/base_coroutine_foundation.h +++ b/strings/base_coroutine_foundation.h @@ -414,7 +414,7 @@ namespace winrt::impl if (handler) { - invoke(handler, *this, status); + winrt::impl::invoke(handler, *this, status); } } @@ -539,7 +539,7 @@ namespace winrt::impl if (handler) { - invoke(handler, *this, status); + winrt::impl::invoke(handler, *this, status); } } diff --git a/test/test/disconnected.cpp b/test/test/disconnected.cpp index 0def1ac69..816344c35 100644 --- a/test/test/disconnected.cpp +++ b/test/test/disconnected.cpp @@ -78,12 +78,7 @@ TEST_CASE("disconnected,handler,1") source(nullptr, 123); } -#if defined(__clang__) -// FIXME: Test is known to fail with unhandled exception when built with Clang. -TEST_CASE("disconnected,handler,2", "[!shouldfail]") -#else TEST_CASE("disconnected,handler,2") -#endif { auto async = Action(); @@ -93,12 +88,7 @@ TEST_CASE("disconnected,handler,2") }); } -#if defined(__clang__) -// FIXME: Test is known to abort when built with Clang. (Seems to be from unhandled exception thrown on a worker thread.) -TEST_CASE("disconnected,handler,3", "[.clang-crash]") -#else TEST_CASE("disconnected,handler,3") -#endif { auto async = ActionProgress(); handle signal{ CreateEventW(nullptr, true, false, nullptr) }; @@ -117,12 +107,7 @@ TEST_CASE("disconnected,handler,3") WaitForSingleObject(signal.get(), INFINITE); } -#if defined(__clang__) -// FIXME: Test is known to fail with unhandled exception when built with Clang. -TEST_CASE("disconnected,handler,4", "[!shouldfail]") -#else TEST_CASE("disconnected,handler,4") -#endif { auto async = Operation(); @@ -132,12 +117,7 @@ TEST_CASE("disconnected,handler,4") }); } -#if defined(__clang__) -// FIXME: Test is known to abort when built with Clang. (Seems to be from unhandled exception thrown on a worker thread.) -TEST_CASE("disconnected,handler,5", "[.clang-crash]") -#else TEST_CASE("disconnected,handler,5") -#endif { auto async = OperationProgress(); handle signal{ CreateEventW(nullptr, true, false, nullptr) }; diff --git a/test/test_win7/disconnected.cpp b/test/test_win7/disconnected.cpp index a68639318..17411e99e 100644 --- a/test/test_win7/disconnected.cpp +++ b/test/test_win7/disconnected.cpp @@ -67,12 +67,7 @@ TEST_CASE("disconnected,1") source(nullptr, 123); } -#if defined(__clang__) -// FIXME: Test is known to fail with unhandled exception when built with Clang. -TEST_CASE("disconnected,2", "[!shouldfail]") -#else TEST_CASE("disconnected,2") -#endif { auto async = Action(); @@ -82,12 +77,7 @@ TEST_CASE("disconnected,2") }); } -#if defined(__clang__) -// FIXME: Test is known to abort when built with Clang. (Seems to be from unhandled exception thrown on a worker thread.) -TEST_CASE("disconnected,3", "[.clang-crash]") -#else TEST_CASE("disconnected,3") -#endif { auto async = ActionProgress(); handle signal{ CreateEventW(nullptr, true, false, nullptr) }; @@ -106,12 +96,7 @@ TEST_CASE("disconnected,3") WaitForSingleObject(signal.get(), INFINITE); } -#if defined(__clang__) -// FIXME: Test is known to fail with unhandled exception when built with Clang. -TEST_CASE("disconnected,4", "[!shouldfail]") -#else TEST_CASE("disconnected,4") -#endif { auto async = Operation(); @@ -121,12 +106,7 @@ TEST_CASE("disconnected,4") }); } -#if defined(__clang__) -// FIXME: Test is known to abort when built with Clang. (Seems to be from unhandled exception thrown on a worker thread.) -TEST_CASE("disconnected,5", "[.clang-crash]") -#else TEST_CASE("disconnected,5") -#endif { auto async = OperationProgress(); handle signal{ CreateEventW(nullptr, true, false, nullptr) };