OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Remove unused headers from hsStlUtils.h (and push them downstream where needed)

Browse Source 
Also fix a couple of plString and header issues identified by Paradox on GCC/Clang
This commit is contained in:
Michael Hansen
2013-01-01 16:54:10 -08:00
parent 3b1568a4e2
commit f510b529f8
55 changed files with 83 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/Plasma/CoreLib/hsStlUtils.cpp
View File

@ -282,6 +282,7 @@ bool formatv(std::wstring & out, const wchar_t * fmt, va_list args)
return success;
}
/*
typedef std::vector<std::string> StringVector;
typedef std::vector<std::wstring> WStringVector;
typedef std::list<std::string> StringList;
@ -295,6 +296,7 @@ template bool GetStringGroup<StringVector>(const std::string& s, StringVector& g
template bool GetStringGroup<WStringVector>(const std::wstring& s, WStringVector& group, wchar_t sep);
template bool GetStringGroup<StringSet>(const std::string& s, StringSet& group, char sep);
template bool GetStringGroup<WStringSet>(const std::wstring& s, WStringSet& group, wchar_t sep);
*/
template <typename T> bool GetStringGroup(const std::string& s, T& group, char sep)
{
@ -337,13 +339,14 @@ template <typename T> bool GetStringGroup(const std::wstring& s, T& group, wchar
return ret;
}
/*
template bool GetStringGroupAsString<StringList>(const StringList& group, std::string& s, char sep);
template bool GetStringGroupAsString<WStringList>(const WStringList& group, std::wstring& s, wchar_t sep);
template bool GetStringGroupAsString<StringVector>(const StringVector& group, std::string& s, char sep);
template bool GetStringGroupAsString<WStringVector>(const WStringVector& group, std::wstring& s, wchar_t sep);
template bool GetStringGroupAsString<StringSet>(const StringSet& group, std::string& s, char sep);
template bool GetStringGroupAsString<WStringSet>(const WStringSet& group, std::wstring& s, wchar_t sep);
*/
template <typename T> bool GetStringGroupAsString(const T& group, std::string& s, char sep)
{

6
Sources/Plasma/CoreLib/hsStlUtils.h
View File

@ -44,13 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include <functional>
#include <algorithm>
#include <string>
#include <vector>
#include <map>
#include <list>
#include <set>
/*****************************************************************************

2
Sources/Plasma/CoreLib/plString.cpp
View File

@ -367,7 +367,7 @@ plStringBuffer<wchar_t> plString::ToWchar() const
return *reinterpret_cast<plStringBuffer<wchar_t>*>(&utf16);
#else
plUnicodeBuffer utf32 = GetUnicodeArray();
return *reinterpret_cast<plStringBuffer<wchar_t>*)(&utf32);
return *reinterpret_cast<plStringBuffer<wchar_t>*>(&utf32);
#endif
}

2
Sources/Plasma/CoreLib/plString.h
View File

@ -172,7 +172,7 @@ public:
plString &operator=(const char *cstr) { IConvertFromUtf8(cstr, kSizeAuto); return *this; }
plString &operator=(const plString &copy) { fUtf8Buffer = copy.fUtf8Buffer; return *this; }
plString &operator=(const plStringBuffer<char> &init);
plString &operator=(const plUnicodeBuffer &init) { IConvertFromUtf32(init.GetData(), init.GetSize()); }
plString &operator=(const plUnicodeBuffer &init) { IConvertFromUtf32(init.GetData(), init.GetSize()); return *this; }
plString &operator+=(const char *cstr) { return operator=(*this + cstr); }
plString &operator+=(const plString &str) { return operator=(*this + str); }