[Scummvm-git-logs] scummvm master -> 5aeaa1015edc4fa371841e4a242cf020152a103b

[bluegr]

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:
5aeaa1015e ENGINES: Fix warning about passing a non-trivial class to va_start.


Commit: 5aeaa1015edc4fa371841e4a242cf020152a103b
    https://github.com/scummvm/scummvm/commit/5aeaa1015edc4fa371841e4a242cf020152a103b
Author: elasota (ejlasota at gmail.com)
Date: 2022-11-26T23:09:24+02:00

Commit Message:
ENGINES: Fix warning about passing a non-trivial class to va_start.

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


diff --git a/engines/engine.cpp b/engines/engine.cpp
index 1a4a37cb706..be05b4b3036 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -464,12 +464,12 @@ void GUIErrorMessageFormat(const char *fmt, ...) {
 	GUIErrorMessage(msg);
 }
 
-void GUIErrorMessageFormat(Common::U32String fmt, ...) {
+void GUIErrorMessageFormatU32StringPtr(const Common::U32String *fmt, ...) {
 	Common::U32String msg("");
 
 	va_list va;
 	va_start(va, fmt);
-	Common::U32String::vformat(fmt.begin(), fmt.end(), msg, va);
+	Common::U32String::vformat(fmt->begin(), fmt->end(), msg, va);
 	va_end(va);
 
 	GUIErrorMessage(msg);
diff --git a/engines/engine.h b/engines/engine.h
index 1824d5dbe81..adc7988dac6 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -78,7 +78,14 @@ void GUIErrorMessageWithURL(const Common::String &msg, const char *url);
 /**
  * Initialize graphics and show an error message.
  */
-void GUIErrorMessageFormat(Common::U32String fmt, ...);
+void GUIErrorMessageFormatU32StringPtr(const Common::U32String *fmt, ...);
+/**
+ * Initialize graphics and show an error message.
+ */
+template<class... TParam>
+inline void GUIErrorMessageFormat(const Common::U32String &fmt, TParam... param) {
+	GUIErrorMessageFormatU32StringPtr(&fmt, Common::forward<TParam>(param)...);
+}
 /**
  * Initialize graphics and show an error message.
  */