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

[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:
e83f23f264 COMMON: Fix Development Tools Build


Commit: e83f23f26455ac64e0fd011985275da0c916851e
    https://github.com/scummvm/scummvm/commit/e83f23f26455ac64e0fd011985275da0c916851e
Author: D G Turner (digitall at scummvm.org)
Date: 2021-06-29T15:39:27+01:00

Commit Message:
COMMON: Fix Development Tools Build

This is not the best solution as it removes the warning when this
code is used by devtools such as create_titanic, but getting this to
link would need inclusion of textconsole.o via shim and then still
breaks on g_system, so fastest solution to restore build.

Changed paths:
    common/base-str.cpp


diff --git a/common/base-str.cpp b/common/base-str.cpp
index 2ac34bd8c4..6c1a80d53d 100644
--- a/common/base-str.cpp
+++ b/common/base-str.cpp
@@ -725,7 +725,9 @@ TEMPLATE void BASESTRING::trim() {
 
 TEMPLATE void BASESTRING::assignAppend(value_type c) {
 	if (c == 0) {
+#ifndef SCUMMVM_UTIL
 		warning("Adding \\0 to String is currently not well defined");
+#endif
 		return;
 	}
 	ensureCapacity(_size + 1, true);