minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-01 07:40:26 +02:00
Code Issues Projects Releases Wiki 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

8
source/Irrlicht/CSoftware2MaterialRenderer.h
View File

@ -27,7 +27,7 @@ public:
}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{
if (Driver)
Driver->setFallback_Material(material.MaterialType);
@ -46,7 +46,7 @@ public:
:CSoftware2MaterialRenderer ( driver ) {}
//! Returns if the material is transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_
virtual bool isTransparent() const IRR_OVERRIDE
{
return false;
}
@ -63,7 +63,7 @@ public:
//! Returns if the material is transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_
virtual bool isTransparent() const IRR_OVERRIDE
{
return true;
}
@ -77,7 +77,7 @@ public:
CSoftware2MaterialRenderer_UNSUPPORTED ( video::CBurningVideoDriver* driver )
: CSoftware2MaterialRenderer ( driver ) {}
virtual s32 getRenderCapability() const _IRR_OVERRIDE_ { return 1; }
virtual s32 getRenderCapability() const IRR_OVERRIDE { return 1; }
};