[Scummvm-git-logs] scummvm master -> 45be20d08b9df9330d07cd7a61cc16f4749d34e2
Helco
noreply at scummvm.org
Sun Sep 14 21:09:38 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
45be20d08b ALCACHOFA: Replace all default destructors
Commit: 45be20d08b9df9330d07cd7a61cc16f4749d34e2
https://github.com/scummvm/scummvm/commit/45be20d08b9df9330d07cd7a61cc16f4749d34e2
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-09-14T23:09:15+02:00
Commit Message:
ALCACHOFA: Replace all default destructors
This should fix compilation on GCC < 4.8 (e.g. RiscOS), where inheritance and default destructors can cause errors complaining about looser throw specifications
Changed paths:
engines/alcachofa/alcachofa.h
engines/alcachofa/debug.h
engines/alcachofa/game.h
engines/alcachofa/graphics-opengl-base.h
engines/alcachofa/graphics.h
engines/alcachofa/objects.h
engines/alcachofa/scheduler.h
diff --git a/engines/alcachofa/alcachofa.h b/engines/alcachofa/alcachofa.h
index c5e29336707..4d089d8dc4e 100644
--- a/engines/alcachofa/alcachofa.h
+++ b/engines/alcachofa/alcachofa.h
@@ -67,7 +67,7 @@ static constexpr SaveVersion kCurrentSaveVersion = SaveVersion::Initial;
class MySerializer : public Common::Serializer {
public:
- using Common::Serializer::Serializer;
+ MySerializer(Common::SeekableReadStream *in, Common::WriteStream *out) : Common::Serializer(in, out) {}
Common::SeekableReadStream &readStream() {
assert(isLoading() && _loadStream != nullptr);
diff --git a/engines/alcachofa/debug.h b/engines/alcachofa/debug.h
index 027ed96a6b8..8ebc8adc7d0 100644
--- a/engines/alcachofa/debug.h
+++ b/engines/alcachofa/debug.h
@@ -30,7 +30,7 @@ namespace Alcachofa {
class IDebugHandler {
public:
- virtual ~IDebugHandler() = default;
+ virtual ~IDebugHandler() {}
virtual void update() = 0;
};
diff --git a/engines/alcachofa/game.h b/engines/alcachofa/game.h
index 548935d43eb..483cf63e603 100644
--- a/engines/alcachofa/game.h
+++ b/engines/alcachofa/game.h
@@ -45,7 +45,7 @@ class Game {
typedef void (*Message)(const char *s, ...);
public:
Game();
- virtual ~Game() = default;
+ virtual ~Game() {}
virtual void onLoadedGameFiles();
diff --git a/engines/alcachofa/graphics-opengl-base.h b/engines/alcachofa/graphics-opengl-base.h
index a9344b2e3db..506a5c0f191 100644
--- a/engines/alcachofa/graphics-opengl-base.h
+++ b/engines/alcachofa/graphics-opengl-base.h
@@ -33,7 +33,7 @@ bool isCompatibleFormat(const Graphics::PixelFormat &format);
class OpenGLTextureBase : public ITexture {
public:
OpenGLTextureBase(int32 w, int32 h, bool withMipmaps);
- ~OpenGLTextureBase() override = default;
+ ~OpenGLTextureBase() override {}
void update(const Graphics::Surface &surface) override;
protected:
diff --git a/engines/alcachofa/graphics.h b/engines/alcachofa/graphics.h
index fcd421d7d3d..d095a3e880b 100644
--- a/engines/alcachofa/graphics.h
+++ b/engines/alcachofa/graphics.h
@@ -60,7 +60,7 @@ class Shape;
class ITexture {
public:
ITexture(Common::Point size);
- virtual ~ITexture() = default;
+ virtual ~ITexture() {}
virtual void update(const Graphics::Surface &surface) = 0;
inline void update(const Graphics::ManagedSurface &surface) { update(surface.rawSurface()); }
@@ -73,7 +73,7 @@ private:
class IRenderer {
public:
- virtual ~IRenderer() = default;
+ virtual ~IRenderer() {}
virtual Common::ScopedPtr<ITexture> createTexture(int32 w, int32 h, bool withMipmaps = true) = 0;
@@ -308,7 +308,7 @@ private:
class IDrawRequest {
public:
IDrawRequest(int8 order);
- virtual ~IDrawRequest() = default;
+ virtual ~IDrawRequest() {}
inline int8 order() const { return _order; }
virtual void draw() = 0;
diff --git a/engines/alcachofa/objects.h b/engines/alcachofa/objects.h
index d5150d8bddf..cb0af316396 100644
--- a/engines/alcachofa/objects.h
+++ b/engines/alcachofa/objects.h
@@ -38,7 +38,7 @@ public:
static constexpr const char *kClassName = "CObjetoBase";
ObjectBase(Room *room, const char *name);
ObjectBase(Room *room, Common::ReadStream &stream);
- virtual ~ObjectBase() = default;
+ virtual ~ObjectBase() {}
inline const Common::String &name() const { return _name; }
inline Room *&room() { return _room; }
@@ -86,7 +86,7 @@ class GraphicObject : public ObjectBase {
public:
static constexpr const char *kClassName = "CObjetoGrafico";
GraphicObject(Room *room, Common::ReadStream &stream);
- ~GraphicObject() override = default;
+ ~GraphicObject() override {}
void draw() override;
void drawDebug() override;
@@ -123,7 +123,7 @@ private:
class ShapeObject : public ObjectBase {
public:
ShapeObject(Room *room, Common::ReadStream &stream);
- ~ShapeObject() override = default;
+ ~ShapeObject() override {}
inline int8 order() const { return _order; }
inline bool isNewlySelected() const { return _isNewlySelected; }
@@ -162,7 +162,7 @@ class MenuButton : public PhysicalObject {
public:
static constexpr const char *kClassName = "CBotonMenu";
MenuButton(Room *room, Common::ReadStream &stream);
- ~MenuButton() override = default;
+ ~MenuButton() override {}
inline int32 actionId() const { return _actionId; }
inline bool &isInteractable() { return _isInteractable; }
@@ -254,7 +254,7 @@ class CheckBox : public PhysicalObject {
public:
static constexpr const char *kClassName = "CCheckBox";
CheckBox(Room *room, Common::ReadStream &stream);
- ~CheckBox() override = default;
+ ~CheckBox() override {}
inline bool &isChecked() { return _isChecked; }
inline int32 actionId() const { return _actionId; }
@@ -285,7 +285,7 @@ class SlideButton final : public ObjectBase {
public:
static constexpr const char *kClassName = "CSlideButton";
SlideButton(Room *room, Common::ReadStream &stream);
- ~SlideButton() override = default;
+ ~SlideButton() override {}
inline float &value() { return _value; }
@@ -330,7 +330,7 @@ class MessageBox final : public ObjectBase {
public:
static constexpr const char *kClassName = "CMessageBox";
MessageBox(Room *room, Common::ReadStream &stream);
- ~MessageBox() override = default;
+ ~MessageBox() override {}
const char *typeName() const override;
@@ -365,7 +365,7 @@ public:
class ITriggerableObject {
public:
ITriggerableObject(Common::ReadStream &stream);
- virtual ~ITriggerableObject() = default;
+ virtual ~ITriggerableObject() {}
inline Direction interactionDirection() const { return _interactionDirection; }
inline Common::Point interactionPoint() const { return _interactionPoint; }
@@ -383,7 +383,7 @@ class InteractableObject : public PhysicalObject, public ITriggerableObject {
public:
static constexpr const char *kClassName = "CObjetoTipico";
InteractableObject(Room *room, Common::ReadStream &stream);
- ~InteractableObject() override = default;
+ ~InteractableObject() override {}
void drawDebug() override;
void onClick() override;
@@ -419,7 +419,7 @@ class Character : public ShapeObject, public ITriggerableObject {
public:
static constexpr const char *kClassName = "CPersonaje";
Character(Room *room, Common::ReadStream &stream);
- ~Character() override = default;
+ ~Character() override {}
void update() override;
void draw() override;
@@ -462,7 +462,7 @@ class WalkingCharacter : public Character {
public:
static constexpr const char *kClassName = "CPersonajeAnda";
WalkingCharacter(Room *room, Common::ReadStream &stream);
- ~WalkingCharacter() override = default;
+ ~WalkingCharacter() override {}
inline bool isWalking() const { return _isWalking; }
inline Common::Point position() const { return _currentPos; }
@@ -589,7 +589,7 @@ class FloorColor final : public ObjectBase {
public:
static constexpr const char *kClassName = "CSueloColor";
FloorColor(Room *room, Common::ReadStream &stream);
- ~FloorColor() override = default;
+ ~FloorColor() override {}
void update() override;
void drawDebug() override;
diff --git a/engines/alcachofa/scheduler.h b/engines/alcachofa/scheduler.h
index 55bb113259c..f29194a92f8 100644
--- a/engines/alcachofa/scheduler.h
+++ b/engines/alcachofa/scheduler.h
@@ -83,7 +83,7 @@ private:
struct Task {
Task(Process &process);
- virtual ~Task() = default;
+ virtual ~Task() {}
virtual TaskReturn run() = 0;
virtual void debugPrint() = 0;
virtual void syncGame(Common::Serializer &s);
More information about the Scummvm-git-logs
mailing list