[Scummvm-git-logs] scummvm master -> 0ff8ef405e25c3ad816298eaba93f59d92a30825

dreammaster dreammaster at scummvm.org
Sun Feb 7 18:22:47 UTC 2021 

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:
0ff8ef405e AGS: Replace = default with {} to hopefully fix riscos compilation


Commit: 0ff8ef405e25c3ad816298eaba93f59d92a30825
    https://github.com/scummvm/scummvm/commit/0ff8ef405e25c3ad816298eaba93f59d92a30825
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-02-07T10:22:06-08:00

Commit Message:
AGS: Replace = default with {} to hopefully fix riscos compilation

Changed paths:
    engines/ags/engine/ac/dynobj/cc_agsdynamicobject.h
    engines/ags/engine/ac/dynobj/cc_dynamicobject.h
    engines/ags/engine/ac/dynobj/scriptdict.h
    engines/ags/engine/ac/dynobj/scriptset.h
    engines/ags/engine/ac/statobj/agsstaticobject.h
    engines/ags/engine/ac/statobj/staticarray.h
    engines/ags/engine/ac/statobj/staticobject.h
    engines/ags/engine/debugging/agseditordebugger.h
    engines/ags/engine/debugging/consoleoutputtarget.cpp
    engines/ags/engine/gfx/ddb.h
    engines/ags/engine/gfx/gfxdriverfactory.h
    engines/ags/engine/gfx/gfxfilter.h
    engines/ags/engine/gfx/gfxmodelist.h
    engines/ags/engine/gfx/graphicsdriver.h
    engines/ags/engine/gui/newcontrol.h
    engines/ags/plugins/ags_snow_rain/weather.cpp
    engines/ags/plugins/ags_sprite_font/character_entry.cpp
    engines/ags/plugins/ags_sprite_font/sprite_font.cpp
    engines/ags/plugins/ags_sprite_font/sprite_font_renderer.cpp
    engines/ags/plugins/ags_sprite_font/variable_width_font.cpp
    engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp
    engines/ags/shared/debugging/outputhandler.h
    engines/ags/shared/font/agsfontrenderer.h
    engines/ags/shared/game/main_game_file.cpp
    engines/ags/shared/gui/guiobject.h
    engines/ags/shared/util/datastream.cpp
    engines/ags/shared/util/error.h
    engines/ags/shared/util/textreader.h
    engines/ags/shared/util/textwriter.h


diff --git a/engines/ags/engine/ac/dynobj/cc_agsdynamicobject.h b/engines/ags/engine/ac/dynobj/cc_agsdynamicobject.h
index da64242dc9..c7e16d6010 100644
--- a/engines/ags/engine/ac/dynobj/cc_agsdynamicobject.h
+++ b/engines/ags/engine/ac/dynobj/cc_agsdynamicobject.h
@@ -29,7 +29,7 @@ namespace AGS3 {
 
 struct AGSCCDynamicObject : ICCDynamicObject {
 protected:
-	virtual ~AGSCCDynamicObject() = default;
+	virtual ~AGSCCDynamicObject() {}
 public:
 	// default implementation
 	int Dispose(const char *address, bool force) override;
diff --git a/engines/ags/engine/ac/dynobj/cc_dynamicobject.h b/engines/ags/engine/ac/dynobj/cc_dynamicobject.h
index 88e4aa1d5a..dc1a3ce503 100644
--- a/engines/ags/engine/ac/dynobj/cc_dynamicobject.h
+++ b/engines/ags/engine/ac/dynobj/cc_dynamicobject.h
@@ -91,8 +91,8 @@ struct ICCDynamicObject {
 	virtual void    WriteFloat(const char *address, intptr_t offset, float val) = 0;
 
 protected:
-	ICCDynamicObject() = default;
-	~ICCDynamicObject() = default;
+	ICCDynamicObject() {}
+	~ICCDynamicObject() {}
 };
 
 struct ICCObjectReader {
diff --git a/engines/ags/engine/ac/dynobj/scriptdict.h b/engines/ags/engine/ac/dynobj/scriptdict.h
index 89a8cb76e5..5b642a0381 100644
--- a/engines/ags/engine/ac/dynobj/scriptdict.h
+++ b/engines/ags/engine/ac/dynobj/scriptdict.h
@@ -76,7 +76,7 @@ class ScriptDictImpl final : public ScriptDictBase {
 public:
 	typedef typename TDict::const_iterator ConstIterator;
 
-	ScriptDictImpl() = default;
+	ScriptDictImpl() {}
 
 	bool IsCaseSensitive() const override {
 		return is_casesensitive;
diff --git a/engines/ags/engine/ac/dynobj/scriptset.h b/engines/ags/engine/ac/dynobj/scriptset.h
index 073390d0dd..1782f4f461 100644
--- a/engines/ags/engine/ac/dynobj/scriptset.h
+++ b/engines/ags/engine/ac/dynobj/scriptset.h
@@ -74,7 +74,7 @@ class ScriptSetImpl final : public ScriptSetBase {
 public:
 	typedef typename TSet::const_iterator ConstIterator;
 
-	ScriptSetImpl() = default;
+	ScriptSetImpl() {}
 
 	bool IsCaseSensitive() const override {
 		return is_casesensitive;
diff --git a/engines/ags/engine/ac/statobj/agsstaticobject.h b/engines/ags/engine/ac/statobj/agsstaticobject.h
index 6b6a0224e6..d4e6e3c8d7 100644
--- a/engines/ags/engine/ac/statobj/agsstaticobject.h
+++ b/engines/ags/engine/ac/statobj/agsstaticobject.h
@@ -28,7 +28,7 @@
 namespace AGS3 {
 
 struct AGSStaticObject : public ICCStaticObject {
-	~AGSStaticObject() override = default;
+	~AGSStaticObject() override {}
 
 	// Legacy support for reading and writing object values by their relative offset
 	const char *GetFieldPtr(const char *address, intptr_t offset) override;
diff --git a/engines/ags/engine/ac/statobj/staticarray.h b/engines/ags/engine/ac/statobj/staticarray.h
index 1c9309c9da..eba2f1d741 100644
--- a/engines/ags/engine/ac/statobj/staticarray.h
+++ b/engines/ags/engine/ac/statobj/staticarray.h
@@ -31,7 +31,7 @@ struct ICCDynamicObject;
 
 struct StaticArray : public ICCStaticObject {
 public:
-	~StaticArray() override = default;
+	~StaticArray() override {}
 
 	void Create(int elem_legacy_size, int elem_real_size, int elem_count = -1 /*unknown*/);
 	void Create(ICCStaticObject *stcmgr, int elem_legacy_size, int elem_real_size, int elem_count = -1 /*unknown*/);
diff --git a/engines/ags/engine/ac/statobj/staticobject.h b/engines/ags/engine/ac/statobj/staticobject.h
index a38e521c00..e776837ae3 100644
--- a/engines/ags/engine/ac/statobj/staticobject.h
+++ b/engines/ags/engine/ac/statobj/staticobject.h
@@ -36,7 +36,7 @@
 namespace AGS3 {
 
 struct ICCStaticObject {
-	virtual ~ICCStaticObject() = default;
+	virtual ~ICCStaticObject() {}
 
 	// Legacy support for reading and writing object values by their relative offset
 	virtual const char *GetFieldPtr(const char *address, intptr_t offset) = 0;
diff --git a/engines/ags/engine/debugging/agseditordebugger.h b/engines/ags/engine/debugging/agseditordebugger.h
index b4bdcfe602..a244178675 100644
--- a/engines/ags/engine/debugging/agseditordebugger.h
+++ b/engines/ags/engine/debugging/agseditordebugger.h
@@ -27,7 +27,7 @@ namespace AGS3 {
 
 struct IAGSEditorDebugger {
 public:
-	virtual ~IAGSEditorDebugger() = default;
+	virtual ~IAGSEditorDebugger() {}
 
 	virtual bool Initialize() = 0;
 	virtual void Shutdown() = 0;
diff --git a/engines/ags/engine/debugging/consoleoutputtarget.cpp b/engines/ags/engine/debugging/consoleoutputtarget.cpp
index cc9a72e452..ebff347358 100644
--- a/engines/ags/engine/debugging/consoleoutputtarget.cpp
+++ b/engines/ags/engine/debugging/consoleoutputtarget.cpp
@@ -31,7 +31,7 @@ namespace Engine {
 ConsoleOutputTarget::ConsoleOutputTarget() {
 }
 
-ConsoleOutputTarget::~ConsoleOutputTarget() = default;
+ConsoleOutputTarget::~ConsoleOutputTarget() {}
 
 void ConsoleOutputTarget::PrintMessage(const DebugMessage &msg) {
 	// limit number of characters for console
diff --git a/engines/ags/engine/gfx/ddb.h b/engines/ags/engine/gfx/ddb.h
index c6fa1a6a12..ca55147a44 100644
--- a/engines/ags/engine/gfx/ddb.h
+++ b/engines/ags/engine/gfx/ddb.h
@@ -35,7 +35,7 @@ namespace Engine {
 
 class IDriverDependantBitmap {
 public:
-	virtual ~IDriverDependantBitmap() = default;
+	virtual ~IDriverDependantBitmap() {}
 
 	virtual void SetTransparency(int transparency) = 0;  // 0-255
 	virtual void SetFlippedLeftRight(bool isFlipped) = 0;
diff --git a/engines/ags/engine/gfx/gfxdriverfactory.h b/engines/ags/engine/gfx/gfxdriverfactory.h
index 2873b345c0..83655a3ff8 100644
--- a/engines/ags/engine/gfx/gfxdriverfactory.h
+++ b/engines/ags/engine/gfx/gfxdriverfactory.h
@@ -51,7 +51,7 @@ typedef std::shared_ptr<IGfxFilter> PGfxFilter;
 
 class IGfxDriverFactory {
 public:
-	virtual ~IGfxDriverFactory() = default;
+	virtual ~IGfxDriverFactory() {}
 
 	// Shutdown graphics factory and deallocate any resources it owns;
 	// graphics factory will be unusable after calling this function.
diff --git a/engines/ags/engine/gfx/gfxfilter.h b/engines/ags/engine/gfx/gfxfilter.h
index 1e03c77190..d8e64f5ee7 100644
--- a/engines/ags/engine/gfx/gfxfilter.h
+++ b/engines/ags/engine/gfx/gfxfilter.h
@@ -57,7 +57,7 @@ struct GfxFilterInfo {
 
 class IGfxFilter {
 public:
-	virtual ~IGfxFilter() = default;
+	virtual ~IGfxFilter() {}
 
 	virtual const GfxFilterInfo &GetInfo() const = 0;
 
diff --git a/engines/ags/engine/gfx/gfxmodelist.h b/engines/ags/engine/gfx/gfxmodelist.h
index c49c1a1e52..b6d679ea14 100644
--- a/engines/ags/engine/gfx/gfxmodelist.h
+++ b/engines/ags/engine/gfx/gfxmodelist.h
@@ -38,7 +38,7 @@ namespace Engine {
 
 class IGfxModeList {
 public:
-	virtual ~IGfxModeList() = default;
+	virtual ~IGfxModeList() {}
 	virtual int  GetModeCount() const = 0;
 	virtual bool GetMode(int index, DisplayMode &mode) const = 0;
 };
diff --git a/engines/ags/engine/gfx/graphicsdriver.h b/engines/ags/engine/gfx/graphicsdriver.h
index 9ff9a77c9c..1c7a9da216 100644
--- a/engines/ags/engine/gfx/graphicsdriver.h
+++ b/engines/ags/engine/gfx/graphicsdriver.h
@@ -189,7 +189,7 @@ public:
 	virtual bool RequiresFullRedrawEachFrame() = 0;
 	virtual bool HasAcceleratedTransform() = 0;
 	virtual bool UsesMemoryBackBuffer() = 0;
-	virtual ~IGraphicsDriver() = default;
+	virtual ~IGraphicsDriver() {}
 };
 
 } // namespace Engine
diff --git a/engines/ags/engine/gui/newcontrol.h b/engines/ags/engine/gui/newcontrol.h
index 43232819fd..ade1a15d7b 100644
--- a/engines/ags/engine/gui/newcontrol.h
+++ b/engines/ags/engine/gui/newcontrol.h
@@ -39,7 +39,7 @@ struct NewControl {
 
 	NewControl(int xx, int yy, int wi, int hi);
 	NewControl();
-	virtual ~NewControl() = default;
+	virtual ~NewControl() {}
 	int mouseisinarea(int mousex, int mousey);
 	void drawifneeded();
 	void drawandmouse();
diff --git a/engines/ags/plugins/ags_snow_rain/weather.cpp b/engines/ags/plugins/ags_snow_rain/weather.cpp
index c744be9bd7..214cb0737e 100644
--- a/engines/ags/plugins/ags_snow_rain/weather.cpp
+++ b/engines/ags/plugins/ags_snow_rain/weather.cpp
@@ -57,7 +57,7 @@ Weather::Weather(bool IsSnow) : _mIsSnow(IsSnow) {
 	Initialize();
 }
 
-Weather::~Weather() = default;
+Weather::~Weather() {}
 
 void Weather::Update() {
 	if (_mTargetAmount > _mAmount)
diff --git a/engines/ags/plugins/ags_sprite_font/character_entry.cpp b/engines/ags/plugins/ags_sprite_font/character_entry.cpp
index 41376a1718..06049c4345 100644
--- a/engines/ags/plugins/ags_sprite_font/character_entry.cpp
+++ b/engines/ags/plugins/ags_sprite_font/character_entry.cpp
@@ -35,7 +35,7 @@ CharacterEntry::CharacterEntry(void) {
 }
 
 
-CharacterEntry::~CharacterEntry(void) = default;
+CharacterEntry::~CharacterEntry(void) {}
 
 } // namespace AGSSpriteFont
 } // namespace Plugins
diff --git a/engines/ags/plugins/ags_sprite_font/sprite_font.cpp b/engines/ags/plugins/ags_sprite_font/sprite_font.cpp
index 2681c46752..1a9030b2dd 100644
--- a/engines/ags/plugins/ags_sprite_font/sprite_font.cpp
+++ b/engines/ags/plugins/ags_sprite_font/sprite_font.cpp
@@ -26,10 +26,10 @@ namespace AGS3 {
 namespace Plugins {
 namespace AGSSpriteFont {
 
-SpriteFont::SpriteFont(void) = default;
+SpriteFont::SpriteFont(void) {}
 
 
-SpriteFont::~SpriteFont(void) = default;
+SpriteFont::~SpriteFont(void) {}
 
 } // namespace AGSSpriteFont
 } // namespace Plugins
diff --git a/engines/ags/plugins/ags_sprite_font/sprite_font_renderer.cpp b/engines/ags/plugins/ags_sprite_font/sprite_font_renderer.cpp
index ed06779cf9..4dd7e31f21 100644
--- a/engines/ags/plugins/ags_sprite_font/sprite_font_renderer.cpp
+++ b/engines/ags/plugins/ags_sprite_font/sprite_font_renderer.cpp
@@ -32,7 +32,7 @@ SpriteFontRenderer::SpriteFontRenderer(IAGSEngine *engine) {
 }
 
 
-SpriteFontRenderer::~SpriteFontRenderer(void) = default;
+SpriteFontRenderer::~SpriteFontRenderer(void) {}
 
 void SpriteFontRenderer::SetSpriteFont(int fontNum, int sprite, int rows, int columns, int charWidth, int charHeight, int charMin, int charMax, bool use32bit) {
 	SpriteFont *font = getFontFor(fontNum);
diff --git a/engines/ags/plugins/ags_sprite_font/variable_width_font.cpp b/engines/ags/plugins/ags_sprite_font/variable_width_font.cpp
index 5361439b0d..466fee9084 100644
--- a/engines/ags/plugins/ags_sprite_font/variable_width_font.cpp
+++ b/engines/ags/plugins/ags_sprite_font/variable_width_font.cpp
@@ -33,7 +33,7 @@ VariableWidthFont::VariableWidthFont(void) {
 }
 
 
-VariableWidthFont::~VariableWidthFont(void) = default;
+VariableWidthFont::~VariableWidthFont(void) {}
 
 void VariableWidthFont::SetGlyph(int character, int x, int y, int width, int height) {
 	characters[character].X = x;
diff --git a/engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp b/engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp
index 827b686e99..3208008ed9 100644
--- a/engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp
+++ b/engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp
@@ -32,7 +32,7 @@ VariableWidthSpriteFontRenderer::VariableWidthSpriteFontRenderer(IAGSEngine *eng
 }
 
 
-VariableWidthSpriteFontRenderer::~VariableWidthSpriteFontRenderer(void) = default;
+VariableWidthSpriteFontRenderer::~VariableWidthSpriteFontRenderer(void) {}
 
 
 
diff --git a/engines/ags/shared/debugging/outputhandler.h b/engines/ags/shared/debugging/outputhandler.h
index 8e51ab19b3..4b353607be 100644
--- a/engines/ags/shared/debugging/outputhandler.h
+++ b/engines/ags/shared/debugging/outputhandler.h
@@ -55,7 +55,7 @@ struct DebugMessage {
 
 class IOutputHandler {
 public:
-	virtual ~IOutputHandler() = default;
+	virtual ~IOutputHandler() {}
 
 	// Print the given text sent from the debug group.
 	// Implementations are free to decide which message components are to be printed, and how.
diff --git a/engines/ags/shared/font/agsfontrenderer.h b/engines/ags/shared/font/agsfontrenderer.h
index 03daf322b6..49d1cf55db 100644
--- a/engines/ags/shared/font/agsfontrenderer.h
+++ b/engines/ags/shared/font/agsfontrenderer.h
@@ -40,8 +40,8 @@ public:
 	virtual void AdjustYCoordinateForFont(int *ycoord, int fontNumber) = 0;
 	virtual void EnsureTextValidForFont(char *text, int fontNumber) = 0;
 protected:
-	IAGSFontRenderer() = default;
-	~IAGSFontRenderer() = default;
+	IAGSFontRenderer() {}
+	~IAGSFontRenderer() {}
 };
 
 // Font render params, mainly for dealing with various compatibility issues and
@@ -59,8 +59,8 @@ public:
 	// Load font, applying extended font rendering parameters
 	virtual bool LoadFromDiskEx(int fontNumber, int fontSize, const FontRenderParams *params) = 0;
 protected:
-	IAGSFontRenderer2() = default;
-	~IAGSFontRenderer2() = default;
+	IAGSFontRenderer2() {}
+	~IAGSFontRenderer2() {}
 };
 
 } // namespace AGS3
diff --git a/engines/ags/shared/game/main_game_file.cpp b/engines/ags/shared/game/main_game_file.cpp
index 08d55da666..2d752246df 100644
--- a/engines/ags/shared/game/main_game_file.cpp
+++ b/engines/ags/shared/game/main_game_file.cpp
@@ -101,7 +101,7 @@ LoadedGameEntities::LoadedGameEntities(GameSetupStruct &game, DialogTopic *&dial
 	, SpriteCount(0) {
 }
 
-LoadedGameEntities::~LoadedGameEntities() = default;
+LoadedGameEntities::~LoadedGameEntities() {}
 
 bool IsMainGameLibrary(const String &filename) {
 	// We must not only detect if the given file is a correct AGS data library,
diff --git a/engines/ags/shared/gui/guiobject.h b/engines/ags/shared/gui/guiobject.h
index c0ba3c4630..463afc872c 100644
--- a/engines/ags/shared/gui/guiobject.h
+++ b/engines/ags/shared/gui/guiobject.h
@@ -47,7 +47,7 @@ enum LegacyGUIAlignment {
 class GUIObject {
 public:
 	GUIObject();
-	virtual ~GUIObject() = default;
+	virtual ~GUIObject() {}
 
 	String          GetEventArgs(int event) const;
 	int             GetEventCount() const;
diff --git a/engines/ags/shared/util/datastream.cpp b/engines/ags/shared/util/datastream.cpp
index 9ec8f39fff..d92d30c717 100644
--- a/engines/ags/shared/util/datastream.cpp
+++ b/engines/ags/shared/util/datastream.cpp
@@ -30,7 +30,7 @@ DataStream::DataStream(DataEndianess stream_endianess)
 	: _streamEndianess(stream_endianess) {
 }
 
-DataStream::~DataStream() = default;
+DataStream::~DataStream() {}
 
 int16_t DataStream::ReadInt16() {
 	int16_t val = 0;
diff --git a/engines/ags/shared/util/error.h b/engines/ags/shared/util/error.h
index 370a1a6c28..6028db6bb0 100644
--- a/engines/ags/shared/util/error.h
+++ b/engines/ags/shared/util/error.h
@@ -114,7 +114,7 @@ public:
 		return ErrorHandle();
 	}
 
-	ErrorHandle() = default;
+	ErrorHandle() {}
 	ErrorHandle(T *err) : _error(err) {
 	}
 	ErrorHandle(std::shared_ptr<T> err) : _error(err) {
diff --git a/engines/ags/shared/util/textreader.h b/engines/ags/shared/util/textreader.h
index c226805659..a6dbd6bfa6 100644
--- a/engines/ags/shared/util/textreader.h
+++ b/engines/ags/shared/util/textreader.h
@@ -37,7 +37,7 @@ namespace Shared {
 
 class TextReader {
 public:
-	virtual ~TextReader() = default;
+	virtual ~TextReader() {}
 
 	virtual bool IsValid() const = 0;
 
diff --git a/engines/ags/shared/util/textwriter.h b/engines/ags/shared/util/textwriter.h
index 87123e5801..783bf5b32d 100644
--- a/engines/ags/shared/util/textwriter.h
+++ b/engines/ags/shared/util/textwriter.h
@@ -37,7 +37,7 @@ namespace Shared {
 
 class TextWriter {
 public:
-	virtual ~TextWriter() = default;
+	virtual ~TextWriter() {}
 
 	virtual bool    IsValid() const = 0;

More information about the Scummvm-git-logs mailing list