From 32021bc251bf110338f28271e87964578cf07e1e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 29 Oct 2022 04:04:20 +0200 Subject: fix build --- serialize/json-helper.hpp | 2 +- serialize/world-impl.hpp | 2 ++ serialize/world-writer.cpp | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'serialize') diff --git a/serialize/json-helper.hpp b/serialize/json-helper.hpp index 9c9d208d..42cd73b3 100644 --- a/serialize/json-helper.hpp +++ b/serialize/json-helper.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace std::filesystem { class path; } diff --git a/serialize/world-impl.hpp b/serialize/world-impl.hpp index 4cff8794..54e4622c 100644 --- a/serialize/world-impl.hpp +++ b/serialize/world-impl.hpp @@ -4,6 +4,8 @@ #pragma once #include "src/tile.hpp" +#include +#include namespace floormat::Serialize { diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp index 8b33d35e..84d894bd 100644 --- a/serialize/world-writer.cpp +++ b/serialize/world-writer.cpp @@ -48,6 +48,9 @@ constexpr auto chunkbuf_size = #ifdef __GNUG__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4996) #endif writer_state::writer_state(const struct world& world) : world{&world} @@ -59,6 +62,8 @@ writer_state::writer_state(const struct world& world) : world{&world} #ifdef __GNUG__ #pragma GCC diagnostic pop +#elif defined _MSC_VER +#pragma warning(pop) #endif atlasid writer_state::intern_atlas(const tile_image& img) @@ -188,6 +193,9 @@ void writer_state::serialize_atlases() #ifdef __GNUG__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4996) #endif ArrayView writer_state::serialize_world() @@ -235,6 +243,8 @@ ArrayView writer_state::serialize_world() #ifdef __GNUG__ #pragma GCC diagnostic pop +#elif defined _MSC_VER +#pragma warning(pop) #endif } // namespace -- cgit v1.2.3