use operator""uz c++23 polyfill

5 files changed, 19 insertions, 19 deletions

diff --git a/serialize/binary-reader.inl b/serialize/binary-reader.inl
index b83fefc6..432b2fa0 100644
--- a/serialize/binary-reader.inl
+++ b/serialize/binary-reader.inl
@@ -23,7 +23,7 @@ constexpr T binary_reader<It>::read() noexcept(false)
     fm_soft_assert((ptrdiff_t)N <= std::distance(it, end));
     num_bytes_read += N;
     char buf[N];
-    for (auto i = 0_uz; i < N; i++)
+    for (auto i = 0uz; i < N; i++)
         buf[i] = *it++;
     return maybe_byteswap(std::bit_cast<T, decltype(buf)>(buf));
 }
@@ -37,7 +37,7 @@ constexpr std::array<char, N> binary_reader<It>::read() noexcept(false)
         array = {};
     fm_soft_assert(N <= (size_t)std::distance(it, end));
     num_bytes_read += N;
-    for (auto i = 0_uz; i < N; i++)
+    for (auto i = 0uz; i < N; i++)
         array[i] = *it++;
     return array;
 }
@@ -73,7 +73,7 @@ constexpr auto binary_reader<It>::read_asciiz_string() noexcept(false)
     };
 
     fixed_string ret;
-    for (auto i = 0_uz; i < MAX && it != end; i++)
+    for (auto i = 0uz; i < MAX && it != end; i++)
     {
         const char c = *it++;
         ret.buf[i] = c;
diff --git a/serialize/binary-writer.inl b/serialize/binary-writer.inl
index 3a5b83d6..e2428c5e 100644
--- a/serialize/binary-writer.inl
+++ b/serialize/binary-writer.inl
@@ -17,7 +17,7 @@ constexpr void binary_writer<It>::write(T x) noexcept
     _bytes_written += sizeof(T);
     constexpr size_t N = sizeof(T);
     const auto buf = std::bit_cast<std::array<char, N>, T>(maybe_byteswap(x));
-    for (auto i = 0_uz; i < N; i++)
+    for (auto i = 0uz; i < N; i++)
         *it++ = buf[i];
 }
 
@@ -34,7 +34,7 @@ constexpr void binary_writer<It>::write_asciiz_string(StringView str) noexcept
     fm_debug_assert(str.flags() & StringViewFlag::NullTerminated);
     const auto sz = str.size();
     _bytes_written += sz + 1;
-    for (auto i = 0_uz; i < sz; i++)
+    for (auto i = 0uz; i < sz; i++)
         *it++ = str[i];
     *it++ = '\0';
 }
diff --git a/serialize/magnum-vector.hpp b/serialize/magnum-vector.hpp
index d1afc0db..a45103d8 100644
--- a/serialize/magnum-vector.hpp
+++ b/serialize/magnum-vector.hpp
@@ -16,7 +16,7 @@ template <size_t N, typename T>
 void adl_serializer<Magnum::Math::Vector<N, T>>::to_json(json& j, const vec& val)
 {
     std::array<T, N> array{};
-    for (auto i = 0_uz; i < N; i++)
+    for (auto i = 0uz; i < N; i++)
         array[i] = val[i];
     using nlohmann::to_json;
     to_json(j, array);
@@ -28,7 +28,7 @@ void adl_serializer<Magnum::Math::Vector<N, T>>::from_json(const json& j, vec& v
     std::array<T, N> array{};
     using nlohmann::from_json;
     from_json(j, array);
-    for (auto i = 0_uz; i < N; i++)
+    for (auto i = 0uz; i < N; i++)
         val[i] = array[i];
 }
 
diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp
index 83ee7629..c5f504c9 100644
--- a/serialize/world-reader.cpp
+++ b/serialize/world-reader.cpp
@@ -91,14 +91,14 @@ void reader_state::read_sceneries(reader_t& s)
     fm_soft_assert(sz < scenery_id_max);
     sceneries.resize(sz);
 
-    auto i = 0_uz;
+    auto i = 0uz;
     while (i < sz)
     {
         uint8_t num; num << s;
         fm_soft_assert(num > 0);
         auto str = s.read_asciiz_string<atlas_name_max>();
         auto sc = loader.scenery(str);
-        for (auto n = 0_uz; n < num; n++)
+        for (auto n = 0uz; n < num; n++)
         {
             atlasid id; id << s;
             fm_soft_assert(id < sz);
@@ -121,7 +121,7 @@ void reader_state::read_strings(reader_t& s)
 {
     uint32_t size; size << s;
     strings.reserve(size);
-    for (auto i = 0_uz; i < size; i++)
+    for (auto i = 0uz; i < size; i++)
     {
         auto str = s.read_asciiz_string<string_max>();
         strings.emplace_back(StringView{str});
@@ -164,7 +164,7 @@ void reader_state::read_chunks(reader_t& s)
     [[maybe_unused]] size_t nbytes_read = 0;
 #endif
 
-    for (auto k = 0_uz; k < N; k++)
+    for (auto k = 0uz; k < N; k++)
     {
         const auto nbytes_start = s.bytes_read();
 
@@ -177,7 +177,7 @@ void reader_state::read_chunks(reader_t& s)
         ch.y << s;
         auto& c = (*_world)[ch];
         c.mark_modified();
-        for (auto i = 0_uz; i < TILE_COUNT; i++)
+        for (auto i = 0uz; i < TILE_COUNT; i++)
         {
             SET_CHUNK_SIZE();
             const tilemeta flags = s.read<tilemeta>();
@@ -219,7 +219,7 @@ void reader_state::read_chunks(reader_t& s)
 
         SET_CHUNK_SIZE();
 
-        for (auto i = 0_uz; i < entity_count; i++)
+        for (auto i = 0uz; i < entity_count; i++)
         {
             object_id _id; _id << s;
             const auto oid = _id & (1ULL << 60)-1;
diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp
index 043e015a..5fe835bf 100644
--- a/serialize/world-writer.cpp
+++ b/serialize/world-writer.cpp
@@ -269,7 +269,7 @@ void writer_state::serialize_scenery()
     s << (atlasid)sz;
 
     StringView last;
-    for (auto i = 0_uz; i < sz; i++)
+    for (auto i = 0uz; i < sz; i++)
     {
         fm_debug_assert(s.bytes_written() + atlasbuf_size1 < atlasbuf_size);
         const auto& [sc, idx] = vec[i];
@@ -277,7 +277,7 @@ void writer_state::serialize_scenery()
         {
             fm_assert(sc->name.size() < atlas_name_max);
             last = sc->name;
-            auto num = 1_uz;
+            auto num = 1uz;
             for (auto j = i+1; j < sz && vec[j].s->name == sc->name; j++)
                 num++;
             fm_assert(num < int_max<uint8_t>);
@@ -298,7 +298,7 @@ void writer_state::serialize_scenery()
 void writer_state::serialize_strings()
 {
     static_assert(character_name_max <= string_max);
-    auto len = 0_uz;
+    auto len = 0uz;
     for (const auto& [k, v] : string_map)
     {
         fm_assert(k.size()+1 < string_max);
@@ -408,7 +408,7 @@ void writer_state::serialize_chunk(const chunk& c, chunk_coords coord)
 
     s << chunk_magic << coord.x << coord.y;
 
-    for (auto i = 0_uz; i < TILE_COUNT; i++)
+    for (auto i = 0uz; i < TILE_COUNT; i++)
     {
         const tile_proto x = c[i];
         const auto ground = x.ground(), wall_north = x.wall_north(), wall_west = x.wall_west();
@@ -506,7 +506,7 @@ ArrayView<const char> writer_state::serialize_world()
     fm_assert(_world->size() <= int_max<chunksiz>);
 
     const auto len = fm_begin(
-        auto len = 0_uz;
+        auto len = 0uz;
         len += std::size(file_magic)-1;
         len += sizeof(proto_t);
         len += atlas_buf.size();
@@ -519,7 +519,7 @@ ArrayView<const char> writer_state::serialize_world()
         return len;
     );
     file_buf.resize(len);
-    auto bytes_written = 0_uz;
+    auto bytes_written = 0uz;
     auto it = file_buf.begin();
     const auto copy = [&](const auto& in) {
         auto len1 = std::distance(std::cbegin(in), std::cend(in)),