diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-22 23:22:06 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-22 23:22:06 +0200 |
| commit | fb914871bf169e8cd6f74cc086cabd5b23e6f739 (patch) | |
| tree | aafb1fbade598be29f8dc6ec54455699133fb74b | |
| parent | 531a60115fb39f1f3dd7fb45ade070e0611cd003 (diff) | |
stuff
| -rw-r--r-- | main/draw.cpp | 2 | ||||
| -rw-r--r-- | serialize/json-helper.hpp | 1 | ||||
| -rw-r--r-- | serialize/world.cpp | 10 |
3 files changed, 5 insertions, 8 deletions
diff --git a/main/draw.cpp b/main/draw.cpp index 5ee38fba..e634823f 100644 --- a/main/draw.cpp +++ b/main/draw.cpp @@ -58,7 +58,7 @@ void app::draw_world() for (std::int16_t y = miny; y <= maxy; y++) for (std::int16_t x = minx; x <= maxx; x++) { -#if 0 +#if 1 if (const chunk_coords c = {x, y}; !_world.contains(c)) make_test_chunk(*_world[c]); #endif diff --git a/serialize/json-helper.hpp b/serialize/json-helper.hpp index b1502295..c6dadf53 100644 --- a/serialize/json-helper.hpp +++ b/serialize/json-helper.hpp @@ -4,7 +4,6 @@ #include <exception> #include <filesystem> #include <nlohmann/json.hpp> -#include <Corrade/Utility/DebugStl.h> struct json_helper final { template<typename t> diff --git a/serialize/world.cpp b/serialize/world.cpp index 835a80f8..8b6f84d7 100644 --- a/serialize/world.cpp +++ b/serialize/world.cpp @@ -7,10 +7,12 @@ #include <memory> #include <nlohmann/json.hpp> -#ifdef __GNUG__ -#pragma GCC diagnostic push +#if defined _MSC_VER +#pragma warning(disable : 4996) +#elif defined __GNUG__ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif + namespace floormat { NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(chunk_coords, x, y) @@ -70,7 +72,3 @@ void adl_serializer<world>::from_json(const json& j, world& val) } } // namespace nlohmann - -#ifdef __GNUG__ -#pragma GCC diagnostic pop -#endif |