luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.

Browse Source 
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:
cutealien
2021-08-27 12:55:10 +00:00
parent ee180dbd24
commit ffd7b63af0
289 changed files with 3401 additions and 3379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/Irrlicht/CIrrDeviceStub.h
View File

@@ -60,87 +60,87 @@ namespace irr
virtual ~CIrrDeviceStub();
//! returns the video driver
virtual video::IVideoDriver* getVideoDriver() _IRR_OVERRIDE_;
virtual video::IVideoDriver* getVideoDriver() IRR_OVERRIDE;
//! return file system
virtual io::IFileSystem* getFileSystem() _IRR_OVERRIDE_;
virtual io::IFileSystem* getFileSystem() IRR_OVERRIDE;
//! returns the gui environment
virtual gui::IGUIEnvironment* getGUIEnvironment() _IRR_OVERRIDE_;
virtual gui::IGUIEnvironment* getGUIEnvironment() IRR_OVERRIDE;
//! returns the scene manager
virtual scene::ISceneManager* getSceneManager() _IRR_OVERRIDE_;
virtual scene::ISceneManager* getSceneManager() IRR_OVERRIDE;
//! \return Returns a pointer to the mouse cursor control interface.
virtual gui::ICursorControl* getCursorControl() _IRR_OVERRIDE_;
virtual gui::ICursorControl* getCursorControl() IRR_OVERRIDE;
//! Returns a pointer to a list with all video modes supported by the gfx adapter.
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_;
virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
//! return the context manager
virtual video::IContextManager* getContextManager() _IRR_OVERRIDE_;
virtual video::IContextManager* getContextManager() IRR_OVERRIDE;
//! Returns a pointer to the ITimer object. With it the current Time can be received.
virtual ITimer* getTimer() _IRR_OVERRIDE_;
virtual ITimer* getTimer() IRR_OVERRIDE;
//! Returns the version of the engine.
virtual const char* getVersion() const _IRR_OVERRIDE_;
virtual const char* getVersion() const IRR_OVERRIDE;
//! send the event to the right receiver
virtual bool postEventFromUser(const SEvent& event) _IRR_OVERRIDE_;
virtual bool postEventFromUser(const SEvent& event) IRR_OVERRIDE;
//! Sets a new event receiver to receive events
virtual void setEventReceiver(IEventReceiver* receiver) _IRR_OVERRIDE_;
virtual void setEventReceiver(IEventReceiver* receiver) IRR_OVERRIDE;
//! Returns pointer to the current event receiver. Returns 0 if there is none.
virtual IEventReceiver* getEventReceiver() _IRR_OVERRIDE_;
virtual IEventReceiver* getEventReceiver() IRR_OVERRIDE;
//! Sets the input receiving scene manager.
/** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */
virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) _IRR_OVERRIDE_;
virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) IRR_OVERRIDE;
//! Returns a pointer to the logger.
virtual ILogger* getLogger() _IRR_OVERRIDE_;
virtual ILogger* getLogger() IRR_OVERRIDE;
//! Provides access to the engine's currently set randomizer.
virtual IRandomizer* getRandomizer() const _IRR_OVERRIDE_;
virtual IRandomizer* getRandomizer() const IRR_OVERRIDE;
//! Sets a new randomizer.
virtual void setRandomizer(IRandomizer* r) _IRR_OVERRIDE_;
virtual void setRandomizer(IRandomizer* r) IRR_OVERRIDE;
//! Creates a new default randomizer.
virtual IRandomizer* createDefaultRandomizer() const _IRR_OVERRIDE_;
virtual IRandomizer* createDefaultRandomizer() const IRR_OVERRIDE;
//! Returns the operation system opertator object.
virtual IOSOperator* getOSOperator() _IRR_OVERRIDE_;
virtual IOSOperator* getOSOperator() IRR_OVERRIDE;
//! Checks if the window is running in fullscreen mode.
virtual bool isFullscreen() const _IRR_OVERRIDE_;
virtual bool isFullscreen() const IRR_OVERRIDE;
//! get color format of the current window
virtual video::ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_;
virtual video::ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE;
//! Activate any joysticks, and generate events for them.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) _IRR_OVERRIDE_;
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) IRR_OVERRIDE;
//! Set the current Gamma Value for the Display
virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) _IRR_OVERRIDE_;
virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) IRR_OVERRIDE;
//! Get the current Gamma Value for the Display
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) _IRR_OVERRIDE_;
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) IRR_OVERRIDE;
//! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behavior.
//! When set to 0 no double- and tripleclicks will be generated.
virtual void setDoubleClickTime( u32 timeMs ) _IRR_OVERRIDE_;
virtual void setDoubleClickTime( u32 timeMs ) IRR_OVERRIDE;
//! Get the maximal elapsed time between 2 clicks to generate double- and tripleclicks for the mouse.
virtual u32 getDoubleClickTime() const _IRR_OVERRIDE_;
virtual u32 getDoubleClickTime() const IRR_OVERRIDE;
//! Remove all messages pending in the system message loop
virtual void clearSystemMessages() _IRR_OVERRIDE_;
virtual void clearSystemMessages() IRR_OVERRIDE;
//! Resize the render window.
virtual void setWindowSize(const irr::core::dimension2d<u32>& size) _IRR_OVERRIDE_ {}
virtual void setWindowSize(const irr::core::dimension2d<u32>& size) IRR_OVERRIDE {}
protected: