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/CGLXManager.h
View File

@@ -34,31 +34,31 @@ namespace video
~CGLXManager();
// Initialize
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_;
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE;
// Terminate
virtual void terminate() _IRR_OVERRIDE_;
virtual void terminate() IRR_OVERRIDE;
// Create surface.
virtual bool generateSurface() _IRR_OVERRIDE_;
virtual bool generateSurface() IRR_OVERRIDE;
// Destroy surface.
virtual void destroySurface() _IRR_OVERRIDE_;
virtual void destroySurface() IRR_OVERRIDE;
// Create context.
virtual bool generateContext() _IRR_OVERRIDE_;
virtual bool generateContext() IRR_OVERRIDE;
// Destroy context.
virtual void destroyContext() _IRR_OVERRIDE_;
virtual void destroyContext() IRR_OVERRIDE;
//! Get current context
virtual const SExposedVideoData& getContext() const _IRR_OVERRIDE_;
virtual const SExposedVideoData& getContext() const IRR_OVERRIDE;
//! Change render context, disable old and activate new defined by videoData
virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_;
virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE;
// Swap buffers.
virtual bool swapBuffers() _IRR_OVERRIDE_;
virtual bool swapBuffers() IRR_OVERRIDE;
XVisualInfo* getVisual() const {return VisualInfo;} // return XVisualInfo