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:
@@ -22,22 +22,22 @@ namespace video
|
||||
CVideoModeList();
|
||||
|
||||
//! Gets amount of video modes in the list.
|
||||
virtual s32 getVideoModeCount() const _IRR_OVERRIDE_;
|
||||
virtual s32 getVideoModeCount() const IRR_OVERRIDE;
|
||||
|
||||
//! Returns the screen size of a video mode in pixels.
|
||||
virtual core::dimension2d<u32> getVideoModeResolution(s32 modeNumber) const _IRR_OVERRIDE_;
|
||||
virtual core::dimension2d<u32> getVideoModeResolution(s32 modeNumber) const IRR_OVERRIDE;
|
||||
|
||||
//! Returns the screen size of an optimal video mode in pixels.
|
||||
virtual core::dimension2d<u32> getVideoModeResolution(const core::dimension2d<u32>& minSize, const core::dimension2d<u32>& maxSize) const _IRR_OVERRIDE_;
|
||||
virtual core::dimension2d<u32> getVideoModeResolution(const core::dimension2d<u32>& minSize, const core::dimension2d<u32>& maxSize) const IRR_OVERRIDE;
|
||||
|
||||
//! Returns the pixel depth of a video mode in bits.
|
||||
virtual s32 getVideoModeDepth(s32 modeNumber) const _IRR_OVERRIDE_;
|
||||
virtual s32 getVideoModeDepth(s32 modeNumber) const IRR_OVERRIDE;
|
||||
|
||||
//! Returns current desktop screen resolution.
|
||||
virtual const core::dimension2d<u32>& getDesktopResolution() const _IRR_OVERRIDE_;
|
||||
virtual const core::dimension2d<u32>& getDesktopResolution() const IRR_OVERRIDE;
|
||||
|
||||
//! Returns the pixel depth of a video mode in bits.
|
||||
virtual s32 getDesktopDepth() const _IRR_OVERRIDE_;
|
||||
virtual s32 getDesktopDepth() const IRR_OVERRIDE;
|
||||
|
||||
//! adds a new mode to the list
|
||||
void addMode(const core::dimension2d<u32>& size, s32 depth);
|
||||
|
Reference in New Issue
Block a user