From 64e6d6c051c9258a52737ec40c0e5d32adac270e Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 14 Feb 2024 20:13:27 +0100
Subject: try to fix msvc

---
 editor/ground-editor.cpp | 8 ++++++--
 editor/ground-editor.hpp | 6 ++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'editor')

diff --git a/editor/ground-editor.cpp b/editor/ground-editor.cpp
index a1abf15c..4c5316a0 100644
--- a/editor/ground-editor.cpp
+++ b/editor/ground-editor.cpp
@@ -1,21 +1,25 @@
 #include "ground-editor.hpp"
 #include "compat/assert.hpp"
+#include "compat/exception.hpp"
 #include "src/ground-atlas.hpp"
 #include "src/world.hpp"
 #include "src/random.hpp"
 #include "keys.hpp"
 #include "loader/loader.hpp"
-#include "compat/exception.hpp"
+#include "loader/ground-cell.hpp"
 #include <memory>
 #include <Corrade/Containers/GrowableArray.h>
 #include <Corrade/Utility/Path.h>
 
 namespace floormat {
 
+typename std::map<StringView, ground_cell>::const_iterator ground_editor::begin() const noexcept { return _atlases.cbegin(); }
+typename std::map<StringView, ground_cell>::const_iterator ground_editor::end() const noexcept { return _atlases.cend(); }
+
 struct ground_editor::tuple
 {
     std::shared_ptr<ground_atlas> atlas;
-    Array<decltype(tile_image_proto::variant)> variant;
+    Array<variant_t> variant;
 };
 
 ground_editor::ground_editor()
diff --git a/editor/ground-editor.hpp b/editor/ground-editor.hpp
index 7baa716f..9745d14b 100644
--- a/editor/ground-editor.hpp
+++ b/editor/ground-editor.hpp
@@ -30,10 +30,8 @@ public:
     ~ground_editor() noexcept;
     std::shared_ptr<ground_atlas> maybe_atlas(StringView str);
     std::shared_ptr<ground_atlas> atlas(StringView str);
-    auto cbegin() const noexcept { return _atlases.cbegin(); }
-    auto cend() const noexcept { return _atlases.cend(); }
-    auto begin() const noexcept { return _atlases.cbegin(); }
-    auto end() const noexcept { return _atlases.cend(); }
+    typename std::map<StringView, ground_cell>::const_iterator begin() const noexcept;
+    typename std::map<StringView, ground_cell>::const_iterator end() const noexcept;
     StringView name() const noexcept;
 
     void clear_selection();
-- 
cgit v1.2.3