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

[criezy]

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:
ca54adca47 COMMON: U32: Fix different types of string pointers for u32


Commit: ca54adca470fe5222bc9b2bfb05e1431db6a8231
    https://github.com/scummvm/scummvm/commit/ca54adca470fe5222bc9b2bfb05e1431db6a8231
Author: aryanrawlani28 (aryanrawlani007 at gmail.com)
Date: 2020-08-30T18:56:12+01:00

Commit Message:
COMMON: U32: Fix different types of string pointers for u32

- Previous changes broke compilation for AmigaOS.

Changed paths:
    common/ustr.cpp
    common/ustr.h


diff --git a/common/ustr.cpp b/common/ustr.cpp
index 5c62cef513..992cefbab4 100644
--- a/common/ustr.cpp
+++ b/common/ustr.cpp
@@ -268,7 +268,7 @@ void U32String::insertString(String s, uint32 p) {
 	}
 }
 
-void U32String::insertString(uint *s, uint32 p) {
+void U32String::insertString(value_type *s, uint32 p) {
 	while (*s != '\0') {
 		U32String::insertChar(*s++, p++);
 	}
@@ -584,7 +584,7 @@ void U32String::trim() {
 	_str[_size] = 0;
 
 	// Trim leading whitespace
-	uint *t = _str;
+	value_type *t = _str;
 	while (isSpace(*t))
 		t++;
 
@@ -624,7 +624,7 @@ int U32String::vformat(U32String::const_iterator fmt, const U32String::const_ite
 		if (ch == '%') {
 			switch (ch = *fmt++) {
 			case 'S':
-				u32string_temp = va_arg(args, uint *);
+				u32string_temp = va_arg(args, value_type *);
 
 				tempPos = output.size();
 				output.insertString(u32string_temp, pos);
diff --git a/common/ustr.h b/common/ustr.h
index a12cb31d8a..9fc3cb1da1 100644
--- a/common/ustr.h
+++ b/common/ustr.h
@@ -173,7 +173,7 @@ public:
 	/** Insert character c before position p. */
 	void insertChar(value_type c, uint32 p);
 	void insertString(String s, uint32 p);
-	void insertString(uint *s, uint32 p);
+	void insertString(value_type *s, uint32 p);
 
 	/**
 	 * Removes the value at position p from the string.