From 75956ac9974dd256200f99edabb9fb603434a830 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Sun, 7 Feb 2021 19:47:13 +0000 Subject: [PATCH] AGS: More RISC OS build fixes --- engines/ags/engine/util/library.h | 4 ++-- engines/ags/engine/util/mutex.h | 4 ++-- engines/ags/engine/util/mutex_std.h | 2 +- engines/ags/engine/util/thread.h | 4 ++-- engines/ags/shared/api/stream_api.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/engines/ags/engine/util/library.h b/engines/ags/engine/util/library.h index 2fe01f20034d..c91c62964dd5 100644 --- a/engines/ags/engine/util/library.h +++ b/engines/ags/engine/util/library.h @@ -32,9 +32,9 @@ namespace Engine { class BaseLibrary { public: - BaseLibrary() = default; + BaseLibrary() {} - virtual ~BaseLibrary() = default; + virtual ~BaseLibrary() {} virtual AGS::Shared::String GetFilenameForLib(AGS::Shared::String libraryName) = 0; diff --git a/engines/ags/engine/util/mutex.h b/engines/ags/engine/util/mutex.h index 0b21a9a6f0d7..a9fd465371e8 100644 --- a/engines/ags/engine/util/mutex.h +++ b/engines/ags/engine/util/mutex.h @@ -29,9 +29,9 @@ namespace Engine { class BaseMutex { public: - BaseMutex() = default; + BaseMutex() {} - virtual ~BaseMutex() = default; + virtual ~BaseMutex() {} BaseMutex &operator=(const BaseMutex &) = delete; BaseMutex(const BaseMutex &) = delete; diff --git a/engines/ags/engine/util/mutex_std.h b/engines/ags/engine/util/mutex_std.h index 47c62091840d..33161c333846 100644 --- a/engines/ags/engine/util/mutex_std.h +++ b/engines/ags/engine/util/mutex_std.h @@ -34,7 +34,7 @@ class StdMutex : public BaseMutex { public: inline StdMutex() : mutex_() { } - inline ~StdMutex() override = default; + inline ~StdMutex() override {} StdMutex &operator=(const StdMutex &) = delete; StdMutex(const StdMutex &) = delete; diff --git a/engines/ags/engine/util/thread.h b/engines/ags/engine/util/thread.h index 356122734ee0..e57cb48c4b04 100644 --- a/engines/ags/engine/util/thread.h +++ b/engines/ags/engine/util/thread.h @@ -31,8 +31,8 @@ class BaseThread { public: typedef void(*AGSThreadEntry)(); - BaseThread() = default; - virtual ~BaseThread() = default; + BaseThread() {} + virtual ~BaseThread() {} BaseThread &operator=(const BaseThread &) = delete; BaseThread(const BaseThread &) = delete; diff --git a/engines/ags/shared/api/stream_api.h b/engines/ags/shared/api/stream_api.h index 682758f1d3e3..f410323c61e2 100644 --- a/engines/ags/shared/api/stream_api.h +++ b/engines/ags/shared/api/stream_api.h @@ -50,7 +50,7 @@ enum StreamSeek { class IAGSStream { public: - virtual ~IAGSStream() = default; + virtual ~IAGSStream() {} virtual void Close() = 0;