From f4303fc419d8ed2a0ded1c1cec795284c49c51fe Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Mon, 18 May 2020 13:32:07 +0200 Subject: [PATCH] Attempt to fix build on OsX --- src/slic3r/GUI/GUI_Preview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 65e1e50589..bf694b445f 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -686,7 +686,7 @@ void Preview::on_combochecklist_features(wxCommandEvent& evt) #if ENABLE_GCODE_VIEWER void Preview::on_combochecklist_options(wxCommandEvent& evt) { - auto xor = [](unsigned int flags1, unsigned int flags2, unsigned int flag) { + auto xored = [](unsigned int flags1, unsigned int flags2, unsigned int flag) { auto is_flag_set = [](unsigned int flags, unsigned int flag) { return (flags & (1 << flag)) != 0; }; @@ -700,8 +700,8 @@ void Preview::on_combochecklist_options(wxCommandEvent& evt) m_canvas->set_gcode_options_visibility_from_flags(new_flags); - bool skip_refresh = xor(curr_flags, new_flags, static_cast(OptionType::Shells)) || - xor(curr_flags, new_flags, static_cast(OptionType::ToolMarker)); + bool skip_refresh = xored(curr_flags, new_flags, static_cast(OptionType::Shells)) || + xored(curr_flags, new_flags, static_cast(OptionType::ToolMarker)); if (!skip_refresh) refresh_print();