From d87c0cb28720610ca7483f2d8de0613f583dc354 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 13 Jan 2024 06:16:07 +0100 Subject: a --- compat/map.hpp | 9 +++++++++ editor/camera.cpp | 1 + editor/editor.hpp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/compat/map.hpp b/compat/map.hpp index 3c1610d4..7983a805 100644 --- a/compat/map.hpp +++ b/compat/map.hpp @@ -14,6 +14,11 @@ constexpr auto map0(const F& fun, const std::array& array, std::index_sequ return std::array { fun(array[Indexes])... }; } +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4996) +#endif + template [[deprecated("zero-length array!")]] CORRADE_ALWAYS_INLINE @@ -22,6 +27,10 @@ constexpr auto map0(const F&, const std::array&, std::index_sequence<>) return std::array, const std::remove_cvref_t&>>, 0>{}; } +#ifdef _MSC_VER +#pragma warning(pop) +#endif + } // namespace floormat::detail::map namespace floormat { diff --git a/editor/camera.cpp b/editor/camera.cpp index b74b048a..9e673ae9 100644 --- a/editor/camera.cpp +++ b/editor/camera.cpp @@ -6,6 +6,7 @@ #include "src/object.hpp" #include "src/world.hpp" #include "src/camera-offset.hpp" +#include #include namespace floormat { diff --git a/editor/editor.hpp b/editor/editor.hpp index 69a5277f..b4e4ff8e 100644 --- a/editor/editor.hpp +++ b/editor/editor.hpp @@ -68,7 +68,7 @@ public: Optional mouse_drag_pos(); using snap_mode = editor_snap_mode; - using button = enum editor_button; + using button = editor_button; }; } // namespace floormat -- cgit v1.2.3