Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 2428cf95bbb8 · 2025-01-02T22:59:10.000Z
0f9e18d Fix TSplitString compile error on Linux/macOS
diff --git a/Shared/sdk/SString.h b/Shared/sdk/SString.h
@@ -124,6 +124,8 @@ struct SCharStringRef
 template <class STRING_TYPE, class CHAR_TYPE>
 class TSplitString : public std::vector<const CHAR_TYPE*>
 {
+    using std::vector<const CHAR_TYPE*>::push_back;
+
 public:
     TSplitString() {}
     TSplitString(const STRING_TYPE& strInput, const STRING_TYPE& strDelim, unsigned int uiMaxAmount = 0, unsigned int uiMinAmount = 0)

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,8 @@ struct SCharStringRef`
`124`	`124`	`template <class STRING_TYPE, class CHAR_TYPE>`
`125`	`125`	`class TSplitString : public std::vector<const CHAR_TYPE*>`
`126`	`126`	`{`
	`127`	`+ using std::vector<const CHAR_TYPE*>::push_back;`
	`128`	`+`
`127`	`129`	`public:`
`128`	`130`	`TSplitString() {}`
`129`	`131`	`TSplitString(const STRING_TYPE& strInput, const STRING_TYPE& strDelim, unsigned int uiMaxAmount = 0, unsigned int uiMinAmount = 0)`