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

28
source/Irrlicht/CXMLWriter.h
View File

@@ -70,7 +70,7 @@ namespace io
virtual ~CXMLWriter() {}
//! Writes a xml 1.0 header like <?xml version="1.0"?>
virtual void writeXMLHeader() _IRR_OVERRIDE_;
virtual void writeXMLHeader() IRR_OVERRIDE;
//! Writes an xml element with maximal 5 attributes
virtual void writeElement(const wchar_t* name, bool empty=false,
@@ -78,24 +78,24 @@ namespace io
const wchar_t* attr2Name = 0, const wchar_t* attr2Value = 0,
const wchar_t* attr3Name = 0, const wchar_t* attr3Value = 0,
const wchar_t* attr4Name = 0, const wchar_t* attr4Value = 0,
const wchar_t* attr5Name = 0, const wchar_t* attr5Value = 0) _IRR_OVERRIDE_;
const wchar_t* attr5Name = 0, const wchar_t* attr5Value = 0) IRR_OVERRIDE;
//! Writes an xml element with any number of attributes
virtual void writeElement(const wchar_t* name, bool empty,
core::array<core::stringw> &names, core::array<core::stringw> &values) _IRR_OVERRIDE_;
core::array<core::stringw> &names, core::array<core::stringw> &values) IRR_OVERRIDE;
//! Writes a comment into the xml file
virtual void writeComment(const wchar_t* comment) _IRR_OVERRIDE_;
virtual void writeComment(const wchar_t* comment) IRR_OVERRIDE;
//! Writes the closing tag for an element. Like </foo>
virtual void writeClosingTag(const wchar_t* name) _IRR_OVERRIDE_;
virtual void writeClosingTag(const wchar_t* name) IRR_OVERRIDE;
//! Writes a text into the file. All occurrences of special characters like
//! & (&amp;), < (&lt;), > (&gt;), and " (&quot;) are automatically replaced.
virtual void writeText(const wchar_t* text) _IRR_OVERRIDE_;
virtual void writeText(const wchar_t* text) IRR_OVERRIDE;
//! Writes a line break
virtual void writeLineBreak() _IRR_OVERRIDE_;
virtual void writeLineBreak() IRR_OVERRIDE;
private:
@@ -114,7 +114,7 @@ namespace io
virtual ~CXMLWriterUTF8() {}
//! Writes a xml 1.0 header like <?xml version="1.0"?>
virtual void writeXMLHeader() _IRR_OVERRIDE_;
virtual void writeXMLHeader() IRR_OVERRIDE;
//! Writes an xml element with maximal 5 attributes
virtual void writeElement(const c8* name, bool empty=false,
@@ -122,24 +122,24 @@ namespace io
const c8* attr2Name = 0, const c8* attr2Value = 0,
const c8* attr3Name = 0, const c8* attr3Value = 0,
const c8* attr4Name = 0, const c8* attr4Value = 0,
const c8* attr5Name = 0, const c8* attr5Value = 0) _IRR_OVERRIDE_;
const c8* attr5Name = 0, const c8* attr5Value = 0) IRR_OVERRIDE;
//! Writes an xml element with any number of attributes
virtual void writeElement(const c8* name, bool empty,
core::array<core::stringc> &names, core::array<core::stringc> &values) _IRR_OVERRIDE_;
core::array<core::stringc> &names, core::array<core::stringc> &values) IRR_OVERRIDE;
//! Writes a comment into the xml file
virtual void writeComment(const c8* comment) _IRR_OVERRIDE_;
virtual void writeComment(const c8* comment) IRR_OVERRIDE;
//! Writes the closing tag for an element. Like </foo>
virtual void writeClosingTag(const c8* name) _IRR_OVERRIDE_;
virtual void writeClosingTag(const c8* name) IRR_OVERRIDE;
//! Writes a text into the file. All occurrences of special characters like
//! & (&amp;), < (&lt;), > (&gt;), and " (&quot;) are automatically replaced.
virtual void writeText(const c8* text) _IRR_OVERRIDE_;
virtual void writeText(const c8* text) IRR_OVERRIDE;
//! Writes a line break
virtual void writeLineBreak() _IRR_OVERRIDE_;
virtual void writeLineBreak() IRR_OVERRIDE;
private: