[Scummvm-git-logs] scummvm master -> 93ee9d0896a38bfda8c1343335a214c701ff00dd

[phcoder]

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:
93ee9d0896 COMMON: Fix operator+ declaration in U32String


Commit: 93ee9d0896a38bfda8c1343335a214c701ff00dd
    https://github.com/scummvm/scummvm/commit/93ee9d0896a38bfda8c1343335a214c701ff00dd
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-31T23:56:40+01:00

Commit Message:
COMMON: Fix operator+ declaration in U32String

Changed paths:
    common/ustr.cpp


diff --git a/common/ustr.cpp b/common/ustr.cpp
index c5ddcc2bee..5e8fc0e39d 100644
--- a/common/ustr.cpp
+++ b/common/ustr.cpp
@@ -125,7 +125,7 @@ U32String operator+(const U32String &x, const U32String &y) {
 	return temp;
 }
 
-U32String operator+(const U32String &x, const uint32 y) {
+U32String operator+(const U32String &x, const U32String::value_type y) {
 	U32String temp(x);
 	temp += y;
 	return temp;