[Scummvm-git-logs] scummvm master -> 372e08635f735200e4a120021ce18077265c7c0c

[mduggan]

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:
372e08635f TESTS: Fix build after type change in ULTIMA engine


Commit: 372e08635f735200e4a120021ce18077265c7c0c
    https://github.com/scummvm/scummvm/commit/372e08635f735200e4a120021ce18077265c7c0c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-11-22T21:45:05+09:00

Commit Message:
TESTS: Fix build after type change in ULTIMA engine

Changed paths:
    test/engines/ultima/ultima8/misc/util.h


diff --git a/test/engines/ultima/ultima8/misc/util.h b/test/engines/ultima/ultima8/misc/util.h
index 5ffc87e603..2d2e2d2d67 100644
--- a/test/engines/ultima/ultima8/misc/util.h
+++ b/test/engines/ultima/ultima8/misc/util.h
@@ -58,8 +58,8 @@ class U8UtilTestSuite : public CxxTest::TestSuite {
 
 	void test_argv_to_string() {
 		// FIXME: It would be nicer if this function didn't leave a trailing space
-		Ultima::Std::vector<Ultima::Std::string> v;
-		Ultima::Std::string s;
+		Common::Array<Common::String> v;
+		Common::String s;
 		Ultima::Ultima8::ArgvToString(v, s);
 		TS_ASSERT_EQUALS(s, "");
 
@@ -70,8 +70,8 @@ class U8UtilTestSuite : public CxxTest::TestSuite {
 	}
 
 	void test_string_to_argv() {
-		Ultima::Std::string s = "";
-		Ultima::Std::vector<Ultima::Std::string> v;
+		Common::Array<Common::String> v;
+		Common::String s;
 		Ultima::Ultima8::StringToArgv(s, v);
 		TS_ASSERT_EQUALS(v.size(), 0);