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

bluegr noreply at scummvm.org
Wed Jan 12 21:53:29 UTC 2022


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:
eed2e93d03 ENGINES: Fix GCC warnings


Commit: eed2e93d03c86b6e9c470664ab4d97ac71897c62
    https://github.com/scummvm/scummvm/commit/eed2e93d03c86b6e9c470664ab4d97ac71897c62
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-01-12T23:53:27+02:00

Commit Message:
ENGINES: Fix GCC warnings

In file included from C:/Projects/scummvm/common/array.h:25,
                 from C:/Projects/scummvm/common/achievements.h:25,
                 from C:/Projects/scummvm/engines/metaengine.h:25,
                 from C:/Projects/scummvm/engines/advancedDetector.h:25,
                 from C:/Projects/scummvm/engines/sci/detection.cpp:22:
C:/Projects/scummvm/common/scummsys.h:400:44: warning: attribute ignored [-Wattributes]
  400 |                 #define WARN_UNUSED_RESULT [[nodiscard]]
      |                                            ^
C:/Projects/scummvm/engines/metaengine.h:565:16: note: in expansion of macro 'WARN_UNUSED_RESULT'
  565 |         static WARN_UNUSED_RESULT bool readSavegameHeader(Common::InSaveFile *in, ExtendedSavegameHeader *header, bool skipThumbnail = true);
      |                ^~~~~~~~~~~~~~~~~~
C:/Projects/scummvm/common/scummsys.h:400:44: note: an attribute that appertains to a type-specifier is ignored
  400 |                 #define WARN_UNUSED_RESULT [[nodiscard]]
      |                                            ^
C:/Projects/scummvm/engines/metaengine.h:565:16: note: in expansion of macro 'WARN_UNUSED_RESULT'
  565 |         static WARN_UNUSED_RESULT bool readSavegameHeader(Common::InSaveFile *in, ExtendedSavegameHeader *header, bool skipThumbnail = true);
      |                ^~~~~~~~~~~~~~~~~~

Changed paths:
    engines/metaengine.h


diff --git a/engines/metaengine.h b/engines/metaengine.h
index 9947fd8f826..49ad9a77a29 100644
--- a/engines/metaengine.h
+++ b/engines/metaengine.h
@@ -562,7 +562,7 @@ public:
 	/**
 	 * Read the extended savegame header from the given savegame file.
 	 */
-	static WARN_UNUSED_RESULT bool readSavegameHeader(Common::InSaveFile *in, ExtendedSavegameHeader *header, bool skipThumbnail = true);
+	WARN_UNUSED_RESULT static bool readSavegameHeader(Common::InSaveFile *in, ExtendedSavegameHeader *header, bool skipThumbnail = true);
 };
 
 /**




More information about the Scummvm-git-logs mailing list