[Scummvm-git-logs] scummvm master -> 7b025fb6f26341bf98418ab44239c3afffb41960

[ccawley2011]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7b025fb6f2 COMMON: Fix compilation with 32-bit Visual Studio


Commit: 7b025fb6f26341bf98418ab44239c3afffb41960
    https://github.com/scummvm/scummvm/commit/7b025fb6f26341bf98418ab44239c3afffb41960
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-01-09T09:52:55Z

Commit Message:
COMMON: Fix compilation with 32-bit Visual Studio

Changed paths:
    common/str-base.cpp


diff --git a/common/str-base.cpp b/common/str-base.cpp
index b95d54f2b9f..b3c2c3a50ec 100644
--- a/common/str-base.cpp
+++ b/common/str-base.cpp
@@ -324,7 +324,7 @@ TEMPLATE bool BASESTRING::operator!=(const value_type *x) const {
 }
 
 TEMPLATE int BASESTRING::compareTo(const BaseString &x) const {
-	int n = cMemCmp(_str, x._str, MIN(_size, x.size()));
+	int n = cMemCmp(_str, x._str, MIN<uint32>(_size, x.size()));
 	if (n != 0)
 		return n;