diff options
| author | JosiahWI <josiah_vanderzee@mediacombb.net> | 2022-10-09 13:57:28 -0500 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2022-10-15 01:09:09 +0200 |
| commit | 59fc4401f1e9edb5d7c0162f2fd221e6df9421fa (patch) | |
| tree | 483622113dd58d84f8b15bb9764c43763cdf0e27 /source/Irrlicht/Android/CAndroidAssetFileArchive.h | |
| parent | f3a1f9f6560c82974f2254d6518f9cd4f4e692b6 (diff) | |
| download | irrlicht-59fc4401f1e9edb5d7c0162f2fd221e6df9421fa.tar.xz | |
Replace _IRR_OVERRIDE_ macro with override keyword
The commit also establishes a precedent of leaving off the `virtual`
keyword in overrides. Although not strictly necessary, I believe this is
good for readability because it makes it clear it is an override and not
a pure virtual function, and it helps keep line lengths shorter. We
should move towards eliminating the macro altogether, but the definition
has been left in with a note on deprecation so that in-progress work
will not suffer merge conflicts.
Diffstat (limited to 'source/Irrlicht/Android/CAndroidAssetFileArchive.h')
| -rw-r--r-- | source/Irrlicht/Android/CAndroidAssetFileArchive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/Irrlicht/Android/CAndroidAssetFileArchive.h b/source/Irrlicht/Android/CAndroidAssetFileArchive.h index 7acf9f4..7d7ab35 100644 --- a/source/Irrlicht/Android/CAndroidAssetFileArchive.h +++ b/source/Irrlicht/Android/CAndroidAssetFileArchive.h @@ -54,7 +54,7 @@ namespace io virtual void addDirectoryToFileList(const io::path &filename);
//! return the name (id) of the file Archive
- virtual const io::path& getArchiveName() const _IRR_OVERRIDE_ {return Path;}
+ const io::path& getArchiveName() const override {return Path;}
protected:
//! Android's asset manager
|