Merge branch 'master' into jgrpp

Remove 'byte' typedef
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
--- a/src/sl/strings_sl.cpp
+++ b/src/sl/strings_sl.cpp
@@ -69,7 +69,7 @@ std::string CopyFromOldName(StringID id)
 		std::ostringstream tmp;
 		std::ostreambuf_iterator<char> strto(tmp);
 		for (; *strfrom != '\0'; strfrom++) {
-			char32_t c = (byte)*strfrom;
+			char32_t c = (uint8_t)*strfrom;

 			/* Map from non-ISO8859-15 characters to UTF-8. */
 			switch (c) {