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:
@@ -24,25 +24,25 @@ public:
|
||||
COSOperator(const core::stringc& osversion);
|
||||
|
||||
//! returns the current operation system version as string.
|
||||
virtual const core::stringc& getOperatingSystemVersion() const _IRR_OVERRIDE_;
|
||||
virtual const core::stringc& getOperatingSystemVersion() const IRR_OVERRIDE;
|
||||
|
||||
//! copies text to the clipboard
|
||||
virtual void copyToClipboard(const c8* text) const _IRR_OVERRIDE_;
|
||||
virtual void copyToClipboard(const c8* text) const IRR_OVERRIDE;
|
||||
|
||||
//! gets text from the clipboard
|
||||
//! \return Returns 0 if no string is in there.
|
||||
virtual const c8* getTextFromClipboard() const _IRR_OVERRIDE_;
|
||||
virtual const c8* getTextFromClipboard() const IRR_OVERRIDE;
|
||||
|
||||
//! gets the processor speed in megahertz
|
||||
//! \param Mhz:
|
||||
//! \return Returns true if successful, false if not
|
||||
virtual bool getProcessorSpeedMHz(u32* MHz) const _IRR_OVERRIDE_;
|
||||
virtual bool getProcessorSpeedMHz(u32* MHz) const IRR_OVERRIDE;
|
||||
|
||||
//! gets the total and available system RAM in kB
|
||||
//! \param Total: will contain the total system memory
|
||||
//! \param Avail: will contain the available memory
|
||||
//! \return Returns true if successful, false if not
|
||||
virtual bool getSystemMemory(u32* Total, u32* Avail) const _IRR_OVERRIDE_;
|
||||
virtual bool getSystemMemory(u32* Total, u32* Avail) const IRR_OVERRIDE;
|
||||
|
||||
private:
|
||||
|
||||
|
Reference in New Issue
Block a user