From 225fb7d8aa0a2890126636cdb2ec77c87f69da5f Mon Sep 17 00:00:00 2001 From: Filip Sykala - NTB T15p Date: Mon, 21 Nov 2022 14:19:45 +0100 Subject: [PATCH] fix: ../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:3021:58: error: use of deleted function 'std::optional& std::optional::operator=(std::optional&&)' ../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:3026:55: error: use of deleted function 'std::optional& std::optional::operator=(std::optional&&)' --- src/slic3r/Utils/WxFontUtils.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/slic3r/Utils/WxFontUtils.cpp b/src/slic3r/Utils/WxFontUtils.cpp index 99542c78b5..422ec725ae 100644 --- a/src/slic3r/Utils/WxFontUtils.cpp +++ b/src/slic3r/Utils/WxFontUtils.cpp @@ -175,9 +175,9 @@ std::optional WxFontUtils::load_wxFont( const std::string &font_descriptor) { wxString font_descriptor_wx(font_descriptor); - wxFont wx_font(font_descriptor_wx); - if (!wx_font.IsOk()) return {}; - return wx_font; + std::optional res = std::make_optional(font_descriptor_wx); + if (!res->IsOk()) return {}; + return res; } using TypeToFamily = boost::bimap; @@ -244,9 +244,9 @@ std::optional WxFontUtils::create_wxFont(const EmbossStyle &style) // default: //} - wxFont font(info); - if (!font.IsOk()) return {}; - return font; + std::optional res = std::make_optional(info); + if (!res->IsOk()) return {}; + return res; } void WxFontUtils::update_property(FontProp &font_prop, const wxFont &font)