actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

g++ 3.4 fixes

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-06 22:50:37 +00:00
parent c11c9fb909
commit f8462d9953
1 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StdString.h
+44 -39
View File
@@ -556,6 +556,47 @@ inline void ssadd(std::string& sDst, PCSTR pA)
// ============================================================================= // =============================================================================
//#define CStdStr _SS // avoid compiler warning 4786 //#define CStdStr _SS // avoid compiler warning 4786
template<typename CT>
class CStdStr;
template<typename CT>
inline
CStdStr<CT> operator+(const CStdStr<CT>& str1, const CStdStr<CT>& str2)
{
CStdStr<CT> strRet(str1);
strRet.append(str2);
return strRet;
}
template<typename CT>
inline
CStdStr<CT> operator+(const CStdStr<CT>& str, CT t)
{
// this particular overload is needed for disabling reference counting
// though it's only an issue from line 1 to line 2
CStdStr<CT> strRet(str); // 1
strRet.append(1, t); // 2
return strRet;
}
template<typename CT>
inline
CStdStr<CT> operator+(const CStdStr<CT>& str, PCSTR pA)
{
return CStdStr<CT>(str) + CStdStr<CT>(pA);
}
template<typename CT>
inline
CStdStr<CT> operator+(PCSTR pA, const CStdStr<CT>& str)
{
CStdStr<CT> strRet(pA);
strRet.append(str);
return strRet;
}
template<typename CT> template<typename CT>
class CStdStr : public std::basic_string<CT> class CStdStr : public std::basic_string<CT>
@@ -800,7 +841,7 @@ public:
// But practically speaking, this works faster // But practically speaking, this works faster
if ( !empty() ) if ( !this->empty() )
ssupr(GetBuf(), this->size()); ssupr(GetBuf(), this->size());
return *this; return *this;
@@ -819,7 +860,7 @@ public:
// But practically speaking, this works faster // But practically speaking, this works faster
if ( !empty() ) if ( !this->empty() )
sslwr(GetBuf(), this->size()); sslwr(GetBuf(), this->size());
return *this; return *this;
@@ -834,7 +875,7 @@ public:
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
CT* GetBuf(int nMinLen=-1) CT* GetBuf(int nMinLen=-1)
{ {
if ( static_cast<int>(size()) < nMinLen ) if ( static_cast<int>(this->size()) < nMinLen )
this->resize(static_cast<MYSIZE>(nMinLen)); this->resize(static_cast<MYSIZE>(nMinLen));
return this->empty() ? const_cast<CT*>(this->data()) : &(this->at(0)); return this->empty() ? const_cast<CT*>(this->data()) : &(this->at(0));
@@ -1186,42 +1227,6 @@ public:
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// CStdStr friend addition functions defined as inline // CStdStr friend addition functions defined as inline
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
template<typename CT>
inline
CStdStr<CT> operator+(const CStdStr<CT>& str1, const CStdStr<CT>& str2)
{
CStdStr<CT> strRet(str1);
strRet.append(str2);
return strRet;
}
template<typename CT>
inline
CStdStr<CT> operator+(const CStdStr<CT>& str, CT t)
{
// this particular overload is needed for disabling reference counting
// though it's only an issue from line 1 to line 2
CStdStr<CT> strRet(str); // 1
strRet.append(1, t); // 2
return strRet;
}
template<typename CT>
inline
CStdStr<CT> operator+(const CStdStr<CT>& str, PCSTR pA)
{
return CStdStr<CT>(str) + CStdStr<CT>(pA);
}
template<typename CT>
inline
CStdStr<CT> operator+(PCSTR pA, const CStdStr<CT>& str)
{
CStdStr<CT> strRet(pA);
strRet.append(str);
return strRet;
}