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

21
source/Irrlicht/CLogger.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_LOGGER_H_INCLUDED__
#define __C_LOGGER_H_INCLUDED__
#ifndef IRR_C_LOGGER_H_INCLUDED
#define IRR_C_LOGGER_H_INCLUDED
#include "ILogger.h"
#include "os.h"
@@ -21,25 +21,25 @@ public:
CLogger(IEventReceiver* r);
//! Returns the current set log level.
virtual ELOG_LEVEL getLogLevel() const _IRR_OVERRIDE_;
virtual ELOG_LEVEL getLogLevel() const IRR_OVERRIDE;
//! Sets a new log level. virtual void setLogLevel(ELOG_LEVEL ll) _IRR_OVERRIDE_;
virtual void setLogLevel(ELOG_LEVEL ll) _IRR_OVERRIDE_;
//! Sets a new log level. virtual void setLogLevel(ELOG_LEVEL ll) IRR_OVERRIDE;
virtual void setLogLevel(ELOG_LEVEL ll) IRR_OVERRIDE;
//! Prints out a text into the log
virtual void log(const c8* text, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_;
virtual void log(const c8* text, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE;
//! Prints out a text into the log
virtual void log(const wchar_t* text, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_;
virtual void log(const wchar_t* text, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE;
//! Prints out a text into the log
virtual void log(const c8* text, const c8* hint, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_;
virtual void log(const c8* text, const c8* hint, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE;
//! Prints out a text into the log
virtual void log(const c8* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_;
virtual void log(const c8* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE;
//! Prints out a text into the log
virtual void log(const wchar_t* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_;
virtual void log(const wchar_t* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE;
//! Sets a new event receiver
void setReceiver(IEventReceiver* r);
@@ -53,4 +53,3 @@ private:
} // end namespace
#endif