[Scummvm-git-logs] scummvm master -> 955e3a471febe53c1c43d7d3fcfba19fcd72ca85

[digitall]

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:
955e3a471f GLK: Fix copy assignment operator warning once again


Commit: 955e3a471febe53c1c43d7d3fcfba19fcd72ca85
    https://github.com/scummvm/scummvm/commit/955e3a471febe53c1c43d7d3fcfba19fcd72ca85
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-15T23:07:32Z

Commit Message:
GLK: Fix copy assignment operator warning once again

Back to square 2 ;)

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


diff --git a/engines/glk/quest/string.h b/engines/glk/quest/string.h
index 879e861e49..825ad3d2f2 100644
--- a/engines/glk/quest/string.h
+++ b/engines/glk/quest/string.h
@@ -45,7 +45,7 @@ public:
 	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=;
+	String& operator=(const String &str) { this->Common::String::operator=(str); return *this; }
 
 	char &operator[](int idx) {
 		assert(_str && idx >= 0 && idx < (int)_size);