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:
@@ -28,22 +28,22 @@ namespace gui
|
||||
virtual ~CGUIMeshViewer();
|
||||
|
||||
//! sets the mesh to be shown
|
||||
virtual void setMesh(scene::IAnimatedMesh* mesh) _IRR_OVERRIDE_;
|
||||
virtual void setMesh(scene::IAnimatedMesh* mesh) IRR_OVERRIDE;
|
||||
|
||||
//! Gets the displayed mesh
|
||||
virtual scene::IAnimatedMesh* getMesh() const _IRR_OVERRIDE_;
|
||||
virtual scene::IAnimatedMesh* getMesh() const IRR_OVERRIDE;
|
||||
|
||||
//! sets the material
|
||||
virtual void setMaterial(const video::SMaterial& material) _IRR_OVERRIDE_;
|
||||
virtual void setMaterial(const video::SMaterial& material) IRR_OVERRIDE;
|
||||
|
||||
//! gets the material
|
||||
virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_;
|
||||
virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE;
|
||||
|
||||
//! called if an event happened.
|
||||
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_;
|
||||
virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
|
||||
|
||||
//! draws the element and its children
|
||||
virtual void draw() _IRR_OVERRIDE_;
|
||||
virtual void draw() IRR_OVERRIDE;
|
||||
|
||||
private:
|
||||
|
||||
|
Reference in New Issue
Block a user