mirror of
https://github.com/minetest/irrlicht.git
synced 2025-07-06 10:10:25 +02:00
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:
@ -185,7 +185,7 @@ class map
|
||||
|
||||
Node& operator*()
|
||||
{
|
||||
_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
|
||||
IRR_DEBUG_BREAK_IF(atEnd()) // access violation
|
||||
|
||||
return *Cur;
|
||||
}
|
||||
@ -333,7 +333,7 @@ class map
|
||||
|
||||
const Node& operator*()
|
||||
{
|
||||
_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
|
||||
IRR_DEBUG_BREAK_IF(atEnd()) // access violation
|
||||
|
||||
return *Cur;
|
||||
}
|
||||
@ -472,7 +472,7 @@ class map
|
||||
|
||||
Node& operator* ()
|
||||
{
|
||||
_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
|
||||
IRR_DEBUG_BREAK_IF(atEnd()) // access violation
|
||||
|
||||
return *getNode();
|
||||
}
|
||||
@ -571,7 +571,7 @@ class map
|
||||
|
||||
Node& operator* ()
|
||||
{
|
||||
_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
|
||||
IRR_DEBUG_BREAK_IF(atEnd()) // access violation
|
||||
|
||||
return *getNode();
|
||||
}
|
||||
@ -639,7 +639,7 @@ class map
|
||||
Node* node = Tree.find(Key);
|
||||
|
||||
// Not found
|
||||
_IRR_DEBUG_BREAK_IF(node==0) // access violation
|
||||
IRR_DEBUG_BREAK_IF(node==0) // access violation
|
||||
|
||||
return node->getValue();
|
||||
}
|
||||
@ -881,7 +881,7 @@ class map
|
||||
}
|
||||
|
||||
//! \deprecated Use empty() instead. This method may be removed by Irrlicht 1.9
|
||||
_IRR_DEPRECATED_ bool isEmpty() const
|
||||
IRR_DEPRECATED bool isEmpty() const
|
||||
{
|
||||
return empty();
|
||||
}
|
||||
|
Reference in New Issue
Block a user