[Scummvm-git-logs] scummvm master -> 6d60f91bc81c93ffb2466fc9ab9685a92844ed4d

[lephilousophe]

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:
6d60f91bc8 Revert "ENGINES: Don't pass U32String by value"


Commit: 6d60f91bc81c93ffb2466fc9ab9685a92844ed4d
    https://github.com/scummvm/scummvm/commit/6d60f91bc81c93ffb2466fc9ab9685a92844ed4d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-09-18T23:32:15+02:00

Commit Message:
Revert "ENGINES: Don't pass U32String by value"

This reverts commit 30d8b64657f431efb13d98123170893e691952e0.
It fails on MSVC with error:
C2338    static_assert failed: 'va_start argument must not have reference type and must not be parenthesized'

Changed paths:
    engines/engine.cpp
    engines/engine.h


diff --git a/engines/engine.cpp b/engines/engine.cpp
index 0846cdd2ba0..a206d5bc8d8 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -464,7 +464,7 @@ void GUIErrorMessageFormat(const char *fmt, ...) {
 	GUIErrorMessage(msg);
 }
 
-void GUIErrorMessageFormat(const Common::U32String &fmt, ...) {
+void GUIErrorMessageFormat(Common::U32String fmt, ...) {
 	Common::U32String msg("");
 
 	va_list va;
diff --git a/engines/engine.h b/engines/engine.h
index 7e028f796ee..5fb6b6f8195 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -78,7 +78,7 @@ void GUIErrorMessageWithURL(const Common::String &msg, const char *url);
 /**
  * Initialize graphics and show an error message.
  */
-void GUIErrorMessageFormat(const Common::U32String &fmt, ...);
+void GUIErrorMessageFormat(Common::U32String fmt, ...);
 /**
  * Initialize graphics and show an error message.
  */