BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Fix -Wignored-qualifiers warnings in irrUString.h

Browse Source
This commit is contained in:
Desour 2023-02-21 18:54:07 +01:00 committed by sfan5
parent ea297196b7
commit 839bdc1a65
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/irrUString.h
View File

@ -963,11 +963,11 @@ public:
#endif #endif
if (sizeof(wchar_t) == 4) if (sizeof(wchar_t) == 4)
append(reinterpret_cast<const uchar32_t* const>(c)); append(reinterpret_cast<const uchar32_t*>(c));
else if (sizeof(wchar_t) == 2) else if (sizeof(wchar_t) == 2)
append(reinterpret_cast<const uchar16_t* const>(c)); append(reinterpret_cast<const uchar16_t*>(c));
else if (sizeof(wchar_t) == 1) else if (sizeof(wchar_t) == 1)
append(reinterpret_cast<const uchar8_t* const>(c)); append(reinterpret_cast<const uchar8_t*>(c));
} }
@ -982,11 +982,11 @@ public:
#endif #endif
if (sizeof(wchar_t) == 4) if (sizeof(wchar_t) == 4)
append(reinterpret_cast<const uchar32_t* const>(c), length); append(reinterpret_cast<const uchar32_t*>(c), length);
else if (sizeof(wchar_t) == 2) else if (sizeof(wchar_t) == 2)
append(reinterpret_cast<const uchar16_t* const>(c), length); append(reinterpret_cast<const uchar16_t*>(c), length);
else if (sizeof(wchar_t) == 1) else if (sizeof(wchar_t) == 1)
append(reinterpret_cast<const uchar8_t* const>(c), length); append(reinterpret_cast<const uchar8_t*>(c), length);
} }
@ -1116,11 +1116,11 @@ public:
ustring16& operator=(const wchar_t* const c) ustring16& operator=(const wchar_t* const c)
{ {
if (sizeof(wchar_t) == 4) if (sizeof(wchar_t) == 4)
*this = reinterpret_cast<const uchar32_t* const>(c); *this = reinterpret_cast<const uchar32_t*>(c);
else if (sizeof(wchar_t) == 2) else if (sizeof(wchar_t) == 2)
*this = reinterpret_cast<const uchar16_t* const>(c); *this = reinterpret_cast<const uchar16_t*>(c);
else if (sizeof(wchar_t) == 1) else if (sizeof(wchar_t) == 1)
*this = reinterpret_cast<const uchar8_t* const>(c); *this = reinterpret_cast<const uchar8_t*>(c);
return *this; return *this;
} }
@ -3049,14 +3049,14 @@ public:
//! Gets the encoding of the Unicode string this class contains. //! Gets the encoding of the Unicode string this class contains.
//! \return An enum describing the current encoding of this string. //! \return An enum describing the current encoding of this string.
const unicode::EUTF_ENCODE getEncoding() const unicode::EUTF_ENCODE getEncoding() const
{ {
return encoding; return encoding;
} }
//! Gets the endianness of the Unicode string this class contains. //! Gets the endianness of the Unicode string this class contains.
//! \return An enum describing the endianness of this string. //! \return An enum describing the endianness of this string.
const unicode::EUTF_ENDIAN getEndianness() const unicode::EUTF_ENDIAN getEndianness() const
{ {
if (encoding == unicode::EUTFE_UTF16_LE || if (encoding == unicode::EUTFE_UTF16_LE ||
encoding == unicode::EUTFE_UTF32_LE) encoding == unicode::EUTFE_UTF32_LE)