From f4cfade14b8830d516bf45eb20523aa17960faa1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 3 May 2021 21:30:31 +0200
Subject: [PATCH] Use std::size_t to iterate

---
 components/nif/niffile.cpp   | 10 +++++-----
 components/nif/nifstream.hpp |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 3e226b35e..221f1d1f3 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -212,7 +212,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
         userVer = nif.getUInt();
 
     // Number of records
-    unsigned int recNum = nif.getUInt();
+    const std::size_t recNum = nif.getUInt();
     records.resize(recNum);
 
     // Bethesda stream header
@@ -251,7 +251,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
                     std::vector<unsigned int> recSizes; // Currently unused
                     nif.getUInts(recSizes, recNum);
                 }
-                unsigned int stringNum = nif.getUInt();
+                const std::size_t stringNum = nif.getUInt();
                 nif.getUInt(); // Max string length
                 if (stringNum)
                     nif.getSizedStrings(strings, stringNum);
@@ -264,7 +264,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
     }
 
     const bool hasRecordSeparators = ver >= NIFStream::generateVersion(10,0,0,0) && ver < NIFStream::generateVersion(10,2,0,0);
-    for (unsigned int i = 0; i < recNum; i++)
+    for (std::size_t i = 0; i < recNum; i++)
     {
         Record *r = nullptr;
 
@@ -308,11 +308,11 @@ void NIFFile::parse(Files::IStreamPtr stream)
         r->read(&nif);
     }
 
-    unsigned int rootNum = nif.getUInt();
+    const std::size_t rootNum = nif.getUInt();
     roots.resize(rootNum);
 
     //Determine which records are roots
-    for (unsigned int i = 0; i < rootNum; i++)
+    for (std::size_t i = 0; i < rootNum; i++)
     {
         int idx = nif.getInt();
         if (idx >= 0 && idx < int(records.size()))
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 4d221b867..cee98dd83 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -25,22 +25,22 @@ class NIFFile;
 /* 
     readLittleEndianBufferOfType: This template should only be used with arithmetic types
 */
-template <uint32_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
+template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
 {
     pIStream->read((char*)dest, numInstances * sizeof(T));
     if constexpr (Misc::IS_BIG_ENDIAN)
-        for (uint32_t i = 0; i < numInstances; i++)
+        for (std::size_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
 }
 
 /*
     readLittleEndianDynamicBufferOfType: This template should only be used with arithmetic types
 */
-template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, uint32_t numInstances)
+template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances)
 {
     pIStream->read((char*)dest, numInstances * sizeof(T));
     if constexpr (Misc::IS_BIG_ENDIAN)
-        for (uint32_t i = 0; i < numInstances; i++)
+        for (std::size_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
 }
 template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream)