mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 05:07:00 -04:00
Cleanup: use override specifier everywhere, and enable gcc warning to check for it.
This commit is contained in:
@@ -54,7 +54,7 @@
|
||||
|
||||
/// Implementation of a dynamic argument
|
||||
#define IMPLEMENT_DYNAMIC_ARG(Type, name, initial) \
|
||||
THREAD_LOCAL Type name##_private = initial;
|
||||
THREAD_LOCAL Type name##_private = initial
|
||||
|
||||
/// Locally change the value of a dynamic argument
|
||||
/** Usage:
|
||||
@@ -107,10 +107,10 @@
|
||||
};
|
||||
|
||||
#define DECLARE_DYNAMIC_ARG(Type, name) \
|
||||
extern ThreadLocalObject<Type> name;
|
||||
extern ThreadLocalObject<Type> name
|
||||
|
||||
#define IMPLEMENT_DYNAMIC_ARG(Type, name, initial) \
|
||||
ThreadLocalObject<Type> name (initial);
|
||||
ThreadLocalObject<Type> name (initial)
|
||||
|
||||
#define WITH_DYNAMIC_ARG(name, value) \
|
||||
name.store(value);
|
||||
|
||||
@@ -316,9 +316,9 @@ inline void after_reading(Packaged& p, Version file_app_version) {
|
||||
/// A package that just contains a bunch of files that are used from other packages
|
||||
class IncludePackage : public Packaged {
|
||||
protected:
|
||||
String typeName() const;
|
||||
Version fileVersion() const;
|
||||
DECLARE_REFLECTION();
|
||||
String typeName() const override;
|
||||
Version fileVersion() const override;
|
||||
DECLARE_REFLECTION_OVERRIDE();
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------- : Utility
|
||||
|
||||
@@ -104,12 +104,12 @@ inline intrusive_ptr<T> make_intrusive(Args&&... args) {
|
||||
/// Declares the type TypeP as a intrusive_ptr<Type>
|
||||
#define DECLARE_POINTER_TYPE(Type) \
|
||||
class Type; \
|
||||
typedef intrusive_ptr<Type> Type##P;
|
||||
typedef intrusive_ptr<Type> Type##P
|
||||
|
||||
/// Declares the type TypeP as a shared_ptr<Type>
|
||||
#define DECLARE_SHARED_POINTER_TYPE(Type) \
|
||||
class Type; \
|
||||
typedef shared_ptr<Type> Type##P;
|
||||
typedef shared_ptr<Type> Type##P
|
||||
|
||||
// ----------------------------------------------------------------------------- : Utility
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
|
||||
class SubversionVCS : public VCS {
|
||||
public:
|
||||
virtual void addFile (const wxFileName& filename);
|
||||
virtual void moveFile (const wxFileName& source, const wxFileName& destination);
|
||||
virtual void removeFile (const wxFileName& filename);
|
||||
void addFile (const wxFileName& filename) final;
|
||||
void moveFile (const wxFileName& source, const wxFileName& destination) final;
|
||||
void removeFile (const wxFileName& filename) final;
|
||||
|
||||
DECLARE_REFLECTION();
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user