[Scummvm-git-logs] scummvm master -> 9585cc8fcfa3695054d4c1541fb155e2ff7cda1a

[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:
9585cc8fcf GLK: Fix compilation


Commit: 9585cc8fcfa3695054d4c1541fb155e2ff7cda1a
    https://github.com/scummvm/scummvm/commit/9585cc8fcfa3695054d4c1541fb155e2ff7cda1a
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-15T14:14:47Z

Commit Message:
GLK: Fix compilation

This amends commit bedba56f24ccb1eaa9381ab36c446bb0b00cfb0c.

Changed paths:
    engines/glk/quest/string.h


diff --git a/engines/glk/quest/string.h b/engines/glk/quest/string.h
index b75b063086..879e861e49 100644
--- a/engines/glk/quest/string.h
+++ b/engines/glk/quest/string.h
@@ -39,7 +39,13 @@ typedef Common::HashMap<String, Common::Array<String>, Common::IgnoreCase_Hash,
 
 class String : public Common::String {
 public:
-	using Common::String::String;
+	String() : Common::String() {}
+	String(const char *str) : Common::String(str) {}
+	String(const char *str, uint32 len) : Common::String(str, len) {}
+	String(const char *beginP, const char *endP) : Common::String(beginP, endP) {}
+	String(const String &str) : Common::String(str) {}
+	explicit String(char c) : Common::String(c) {}
+	using Common::String::operator=;
 
 	char &operator[](int idx) {
 		assert(_str && idx >= 0 && idx < (int)_size);