From 83fda73ce320f17b35013bdef566c2a23d0f1a1b Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 12 Sep 2018 17:45:02 +0300 Subject: [PATCH] Workaround MSVC 15.8.4 regression. It crashes with non-type-erased producers. --- Telegram/SourceFiles/rpl/producer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/rpl/producer.h b/Telegram/SourceFiles/rpl/producer.h index fb130e3d4..7aaa366d9 100644 --- a/Telegram/SourceFiles/rpl/producer.h +++ b/Telegram/SourceFiles/rpl/producer.h @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include -#if defined _DEBUG +#if defined _DEBUG || defined COMPILER_MSVC #define RPL_PRODUCER_TYPE_ERASED_ALWAYS #endif // _DEBUG @@ -443,9 +443,9 @@ template < inline auto make_producer(Generator &&generator) #ifdef RPL_PRODUCER_TYPE_ERASED_ALWAYS -> producer { -#else // RPL_CONSUMER_TYPE_ERASED_ALWAYS +#else // RPL_PRODUCER_TYPE_ERASED_ALWAYS -> producer> { -#endif // !RPL_CONSUMER_TYPE_ERASED_ALWAYS +#endif // !RPL_PRODUCER_TYPE_ERASED_ALWAYS return std::forward(generator); }