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

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/Irrlicht/COSOperator.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_OS_OPERATOR_H_INCLUDED__
#define __C_OS_OPERATOR_H_INCLUDED__
#ifndef IRR_C_OS_OPERATOR_H_INCLUDED
#define IRR_C_OS_OPERATOR_H_INCLUDED
#include "IOSOperator.h"
@@ -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:
@@ -57,4 +57,3 @@ private:
} // end namespace
#endif