diff --git a/Sources/Plasma/CoreLib/hsTemplates.h b/Sources/Plasma/CoreLib/hsTemplates.h index f5f0ffe4..7d975eea 100644 --- a/Sources/Plasma/CoreLib/hsTemplates.h +++ b/Sources/Plasma/CoreLib/hsTemplates.h @@ -47,6 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsRefCnt.h" #include +#include #ifdef HS_DEBUGGING diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h index 0d4537b4..6d7fea92 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h @@ -740,25 +740,25 @@ public: //=========================================================================== template TArray::TArray () : TFArray() { - m_chunkSize = std::max(1u, 256 / sizeof(T)); + m_chunkSize = std::max(size_t(1), 256 / sizeof(T)); } //=========================================================================== template TArray::TArray (const char file[], int line) : TFArray(file, line) { - m_chunkSize = std::max(1u, 256 / sizeof(T)); + m_chunkSize = std::max(size_t(1), 256 / sizeof(T)); } //=========================================================================== template TArray::TArray (unsigned count) : TFArray(count) { - m_chunkSize = std::max(1u, 256 / sizeof(T)); + m_chunkSize = std::max(size_t(1), 256 / sizeof(T)); } //=========================================================================== template TArray::TArray (const T * source, unsigned count) : TFArray(source, count) { - m_chunkSize = std::max(1u, 256 / sizeof(T)); + m_chunkSize = std::max(size_t(1), 256 / sizeof(T)); } //=========================================================================== diff --git a/Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp b/Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp index b3dc5622..3aa975c4 100644 --- a/Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp +++ b/Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp @@ -721,7 +721,7 @@ bool plSecureStream::GetSecureEncryptionKey(const plFileName& filename, uint32_t } // file doesn't exist, use default key - unsigned memSize = std::min(length, arrsize(plSecureStream::kDefaultKey)); + unsigned memSize = std::min(size_t(length), arrsize(plSecureStream::kDefaultKey)); memSize *= sizeof(uint32_t); memcpy(key, plSecureStream::kDefaultKey, memSize);