[Scummvm-git-logs] scummvm master -> 03f11aaa32a8ac05b6ac348fcdd3808f3113162e

[Strangerke]

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:
03f11aaa32 BAGEL: Remove a couple of keywords which generate issues using GCC


Commit: 03f11aaa32a8ac05b6ac348fcdd3808f3113162e
    https://github.com/scummvm/scummvm/commit/03f11aaa32a8ac05b6ac348fcdd3808f3113162e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-27T22:00:57+01:00

Commit Message:
BAGEL: Remove a couple of keywords which generate issues using GCC

Changed paths:
    engines/bagel/baglib/storage_dev_win.h
    engines/bagel/boflib/gui/dialog.h


diff --git a/engines/bagel/baglib/storage_dev_win.h b/engines/bagel/baglib/storage_dev_win.h
index 8ccbbadfa04..0eaab786941 100644
--- a/engines/bagel/baglib/storage_dev_win.h
+++ b/engines/bagel/baglib/storage_dev_win.h
@@ -512,7 +512,7 @@ public:
 
 	ErrorCode loadFile(const CBofString &sWldFile) override;
 
-	ErrorCode create(const char *pszName, CBofRect *pRect = nullptr, CBofWindow *pParent = nullptr, uint32 nControlID = 0) override;
+	ErrorCode create(const char *pszName, CBofRect *pRect = nullptr, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
 
 	ErrorCode attach() override; // This function attaches the background and necessary bitmaps
 
diff --git a/engines/bagel/boflib/gui/dialog.h b/engines/bagel/boflib/gui/dialog.h
index 1989f282778..45185edf997 100644
--- a/engines/bagel/boflib/gui/dialog.h
+++ b/engines/bagel/boflib/gui/dialog.h
@@ -94,7 +94,7 @@ public:
 	 * @param nControlID	Control Id
 	 * @return				Error return code
 	 */
-	virtual ErrorCode create(const char *pszName, CBofRect *pRect = nullptr, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
+	ErrorCode create(const char *pszName, CBofRect *pRect = nullptr, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
 
 	/**
 	 * Set the dialog flags