luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.

Browse Source 
C++ has undefined behavior for identifiers starting with __ or with _ followed by an uppercase letter.
We still have many more (in IrrCompileConfig.h and in all header-guards), will likely replace those later as well.
As a workaround for users which might use irrlicht defines in their code, I've added the header irrLegacyDefines.h
Including that allows to continue using old defines for a while - or make it easier to have code which compiles 
with old and new Irrlicht library versions.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6251 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 12:55:10 +00:00
parent ee180dbd24
commit ffd7b63af0
289 changed files with 3401 additions and 3379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/Irrlicht/CImageLoaderWAL.h
View File

@@ -37,9 +37,9 @@ namespace video
class CImageLoaderLMP : public irr::video::IImageLoader
{
public:
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const _IRR_OVERRIDE_;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const _IRR_OVERRIDE_;
virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const IRR_OVERRIDE;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const IRR_OVERRIDE;
};
#endif
@@ -50,18 +50,18 @@ public:
class CImageLoaderWAL : public irr::video::IImageLoader
{
public:
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const _IRR_OVERRIDE_;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const _IRR_OVERRIDE_;
virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const IRR_OVERRIDE;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const IRR_OVERRIDE;
};
//! An Irrlicht image loader for Halflife 1 engine textures
class CImageLoaderWAL2 : public irr::video::IImageLoader
{
public:
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const _IRR_OVERRIDE_;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const _IRR_OVERRIDE_;
virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const IRR_OVERRIDE;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const IRR_OVERRIDE;
};
// byte-align structures