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:
@@ -55,7 +55,7 @@ namespace scene
|
||||
}
|
||||
|
||||
//! Event receiver, override this function for camera controlling animators
|
||||
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_
|
||||
virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -129,14 +129,14 @@ namespace scene
|
||||
}
|
||||
|
||||
//! Writes attributes of the scene node animator.
|
||||
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_
|
||||
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE
|
||||
{
|
||||
out->addBool("IsEnabled", IsEnabled);
|
||||
// timers not serialized as they usually depend on system-time which is different on each application start.
|
||||
}
|
||||
|
||||
//! Reads attributes of the scene node animator.
|
||||
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_
|
||||
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE
|
||||
{
|
||||
IsEnabled = in->getAttributeAsBool("IsEnabled", IsEnabled);
|
||||
PauseTimeSum = 0;
|
||||
|
Reference in New Issue
Block a user