API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.
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:
24
include/irrLegacyDefines.h
Normal file
24
include/irrLegacyDefines.h
Normal file
@@ -0,0 +1,24 @@
|
||||
// This file is part of the "Irrlicht Engine".
|
||||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#ifndef IRR_LEGACY_DEFINES_H_INCLUDED
|
||||
#define IRR_LEGACY_DEFINES_H_INCLUDED
|
||||
|
||||
//! Include this file _after_ irrlicht.h
|
||||
//! It contains old defines which got replaced in Irrlicht.
|
||||
//! So including this header is a quick fix to allow users compiling old code
|
||||
//! without having to rewrite it all. Thought in the long run you should
|
||||
//! switch to the new defines as well.
|
||||
|
||||
// Defines replaced in Irrlicht 1.9 as they were reserved identifiers in c++
|
||||
#define _IRR_DEPRECATED_ IRR_DEPRECATED
|
||||
#define _IRR_OVERRIDE_ IRR_OVERRIDE
|
||||
#define _IRR_DEBUG_BREAK_IF IRR_DEBUG_BREAK_IF
|
||||
#define _IRR_TEXT IRR_TEXT
|
||||
|
||||
// Defines which changed in Irrlicht 1.9 as they were reserved identifiers in c++,
|
||||
// but can't be set here as there are only checks _if_ they are defined.
|
||||
// If you have any of those in your code, you will have to change them there.
|
||||
// _IRR_DONT_DO_MEMORY_DEBUGGING_HERE -> IRR_DONT_DO_MEMORY_DEBUGGING_HERE
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user