From 6f87b99a79a239edb04bf9d0818a529aa5c31f4b Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Mon, 29 Jun 2020 22:22:12 +0200 Subject: [PATCH] [ADT] Use more explicit from to initialize member. Appease MSVC? Or at least get a clearer error message: http://lab.llvm.org:8011/builders/mlir-windows/builds/3958/steps/build-unified-tree/logs/stdio --- llvm/include/llvm/ADT/FunctionExtras.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/include/llvm/ADT/FunctionExtras.h b/llvm/include/llvm/ADT/FunctionExtras.h index b675889..4c75e4d 100644 --- a/llvm/include/llvm/ADT/FunctionExtras.h +++ b/llvm/include/llvm/ADT/FunctionExtras.h @@ -249,8 +249,8 @@ protected: // Now move into the storage. new (CallableAddr) CallableT(std::move(Callable)); - CallbackAndInlineFlag = {&CallbacksHolder::Callbacks, - IsInlineStorage}; + CallbackAndInlineFlag.setPointerAndInt( + &CallbacksHolder::Callbacks, IsInlineStorage); } ~UniqueFunctionBase() { -- 2.7.4