[Scummvm-git-logs] scummvm master -> d2251bde1caf843781da81c9a91da14fbccd8a3d

criezy criezy at scummvm.org
Sat Oct 31 21:33:41 UTC 2020


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:
d2251bde1c COMMON: Fix additional compilation errors in U32String


Commit: d2251bde1caf843781da81c9a91da14fbccd8a3d
    https://github.com/scummvm/scummvm/commit/d2251bde1caf843781da81c9a91da14fbccd8a3d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-10-31T21:32:36Z

Commit Message:
COMMON: Fix additional compilation errors in U32String

Changed paths:
    common/ustr.cpp


diff --git a/common/ustr.cpp b/common/ustr.cpp
index 20047d7afa..c5ddcc2bee 100644
--- a/common/ustr.cpp
+++ b/common/ustr.cpp
@@ -133,13 +133,13 @@ U32String operator+(const U32String &x, const uint32 y) {
 
 void U32String::insertString(const char *s, uint32 p) {
 	while (*s != '\0') {
-		BaseString::insertChar(*s++, p++);
+		BaseString<u32char_type_t>::insertChar(*s++, p++);
 	}
 }
 
 void U32String::insertString(const String &s, uint32 p) {
 	for (uint32 i = 0; i < s.size(); ++i) {
-		BaseString::insertChar(s[i], p++);
+		BaseString<u32char_type_t>::insertChar(s[i], p++);
 	}
 }
 




More information about the Scummvm-git-logs mailing list