From b70bfc88ac67d4a477793c37c3939e163a5c0b8f Mon Sep 17 00:00:00 2001 From: LucaSas Date: Fri, 6 Dec 2019 22:33:26 +0000 Subject: [PATCH 1/2] Fix for #344. Set _MSVC_STL_UPDATE value to December 2019. --- stl/inc/yvals_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h index aafec2118e6..d0ca6c339da 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -424,7 +424,7 @@ #define _CPPLIB_VER 650 #define _MSVC_STL_VERSION 142 -#define _MSVC_STL_UPDATE 201911L +#define _MSVC_STL_UPDATE 201912L #ifndef _ALLOW_COMPILER_AND_STL_VERSION_MISMATCH #ifdef __EDG__ From 52892bfbdfac7874aa34fffceee2ef74044ab224 Mon Sep 17 00:00:00 2001 From: LucaSas Date: Fri, 6 Dec 2019 22:49:37 +0000 Subject: [PATCH 2/2] Fixed #272 Replaced `&_Val` with `_STD addressof(_Val)` to support overloaded `operator&()` --- stl/inc/future | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stl/inc/future b/stl/inc/future index 2e7ea87052f..53d98572d94 100644 --- a/stl/inc/future +++ b/stl/inc/future @@ -1238,11 +1238,11 @@ public: } void set_value(_Ty& _Val) { - _MyPromise._Get_state_for_set()._Set_value(&_Val, false); + _MyPromise._Get_state_for_set()._Set_value(_STD addressof(_Val), false); } void set_value_at_thread_exit(_Ty& _Val) { - _MyPromise._Get_state_for_set()._Set_value(&_Val, true); + _MyPromise._Get_state_for_set()._Set_value(_STD addressof(_Val), true); } void set_exception(exception_ptr _Exc) {