TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-28 19:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compilation fixes for C++20

Browse source
This commit is contained in:
Jeff Hutchinson 2022-11-27 23:08:07 -05:00
parent e16351605b
commit 1940becb2d
40 changed files with 220 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/core/util/path.h
View file

@ -72,6 +72,7 @@ public:
bool operator == (const Path& path) const { return getFullPath().equal(path.getFullPath()); }
bool operator != (const Path& path) const { return !(*this == path); }
bool operator != (const String& path) const { return !(getFullPath().equal(path)); }
bool isEmpty() const { return getFullPath().isEmpty(); }

5
Engine/source/core/util/str.cpp
View file

@ -415,11 +415,12 @@ class String::StringData : protected StringDataImpl
static StringData* Empty()
{
static UTF16 emptyUTF16[ 1 ] = { 0 };
static UTF16 emptyUTF16[1] = { 0 };
static UTF8 emptyUTF8[1] = { 0 };
static StringDataImpl empty =
{
#ifdef TORQUE_DEBUG
"", // mString
emptyUTF8, // mString
#endif
U32_MAX, // mRefCount

16
Engine/source/core/util/tList.h
View file

@ -411,22 +411,14 @@ inline List<Type>::_Iterator<U,E>::_Iterator(E* ptr)
// recheck this and remove if fixed with VS2008 SP1
template<class Type> template<class U,typename E>
#ifdef _MSC_VER
inline typename List<Type>:: _Iterator<U,E>& List<Type>::_Iterator<U,E>::operator++()
#else
inline typename List<Type>::template _Iterator<U,E>& List<Type>::_Iterator<U,E>::operator++()
#endif
{
_link = _link->next;
return *this;
}
template<class Type> template<class U,typename E>
#ifdef _MSC_VER
inline typename List<Type>:: _Iterator<U,E> List<Type>::_Iterator<U,E>::operator++(int)
#else
inline typename List<Type>::template _Iterator<U,E> List<Type>::_Iterator<U,E>::operator++(int)
#endif
{
_Iterator itr(*this);
_link = _link->next;
@ -434,22 +426,14 @@ inline typename List<Type>::template _Iterator<U,E> List<Type>::_Iterator<U,E>::
}
template<class Type> template<class U,typename E>
#ifdef _MSC_VER
inline typename List<Type>:: _Iterator<U,E>& List<Type>::_Iterator<U,E>::operator--()
#else
inline typename List<Type>::template _Iterator<U,E>& List<Type>::_Iterator<U,E>::operator--()
#endif
{
_link = _link->prev;
return *this;
}
template<class Type> template<class U,typename E>
#ifdef _MSC_VER
inline typename List<Type>:: _Iterator<U,E> List<Type>::_Iterator<U,E>::operator--(int)
#else
inline typename List<Type>::template _Iterator<U,E> List<Type>::_Iterator<U,E>::operator--(int)
#endif
{
_Iterator itr(*this);
_link = _link->prev;