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

24
source/Irrlicht/CMemoryFile.h
View File

@@ -29,28 +29,28 @@ namespace io
virtual ~CMemoryReadFile();
//! returns how much was read
virtual size_t read(void* buffer, size_t sizeToRead) _IRR_OVERRIDE_;
virtual size_t read(void* buffer, size_t sizeToRead) IRR_OVERRIDE;
//! changes position in file, returns true if successful
virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_;
virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE;
//! returns size of file
virtual long getSize() const _IRR_OVERRIDE_;
virtual long getSize() const IRR_OVERRIDE;
//! returns where in the file we are.
virtual long getPos() const _IRR_OVERRIDE_;
virtual long getPos() const IRR_OVERRIDE;
//! returns name of file
virtual const io::path& getFileName() const _IRR_OVERRIDE_;
virtual const io::path& getFileName() const IRR_OVERRIDE;
//! Get the type of the class implementing this interface
virtual EREAD_FILE_TYPE getType() const _IRR_OVERRIDE_
virtual EREAD_FILE_TYPE getType() const IRR_OVERRIDE
{
return ERFT_MEMORY_READ_FILE;
}
//! Get direct access to internal buffer
virtual const void *getBuffer() const _IRR_OVERRIDE_
virtual const void *getBuffer() const IRR_OVERRIDE
{
return Buffer;
}
@@ -78,18 +78,18 @@ namespace io
virtual ~CMemoryWriteFile();
//! returns how much was written
virtual size_t write(const void* buffer, size_t sizeToWrite) _IRR_OVERRIDE_;
virtual size_t write(const void* buffer, size_t sizeToWrite) IRR_OVERRIDE;
//! changes position in file, returns true if successful
virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_;
virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE;
//! returns where in the file we are.
virtual long getPos() const _IRR_OVERRIDE_;
virtual long getPos() const IRR_OVERRIDE;
//! returns name of file
virtual const io::path& getFileName() const _IRR_OVERRIDE_;
virtual const io::path& getFileName() const IRR_OVERRIDE;
virtual bool flush() _IRR_OVERRIDE_;
virtual bool flush() IRR_OVERRIDE;
private: