X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/3cc4710818c810ca4e899cfd3d52f091815017d2..489de0deb4c1182cfbce41809b17892fcf9430fd:/stglibs/common.lib/include/stg/common.h diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h index fe3b3af2..af0f89a1 100644 --- a/stglibs/common.lib/include/stg/common.h +++ b/stglibs/common.lib/include/stg/common.h @@ -66,6 +66,8 @@ void Decode21(char * dst, const char * src); void Encode12str(std::string & dst, const std::string & src); void Decode21str(std::string & dst, const std::string & src); +inline std::string Encode12str(const std::string & src) { std::string dst; Encode12str(dst, src); return dst; } +inline std::string Decode21str(const std::string & src) { std::string dst; Decode21str(dst, src); return dst; } int ParseIPString(const char * str, uint32_t * ips, int maxIP); void KOIToWin(const char * s1, char * s2, int l); @@ -97,6 +99,9 @@ std::string & TrimL(std::string & val); std::string & TrimR(std::string & val); std::string & Trim(std::string & val); +std::string ToLower(std::string value); +std::string ToUpper(std::string value); + template C Split(const std::string & value, char delim, F conv) { @@ -147,6 +152,7 @@ std::string ToPrintable(const std::string & src); //----------------------------------------------------------------------------- int str2x(const std::string & str, int32_t & x); int str2x(const std::string & str, uint32_t & x); +int str2x(const std::string & str, double & x); #ifndef WIN32 int str2x(const std::string & str, int64_t & x); int str2x(const std::string & str, uint64_t & x); @@ -163,11 +169,11 @@ int str2x(const std::string & str, varT & x); template const std::string & x2str(varT x, std::string & s); template -const std::string & x2str(varT x) { std::string s; return x2str(x, s); } +std::string x2str(varT x) { std::string s; return x2str(x, s); } template const std::string & unsigned2str(varT x, std::string & s); template -const std::string & unsigned2str(varT x) { std::string s; return unsigned2str(x, s); } +std::string unsigned2str(varT x) { std::string s; return unsigned2str(x, s); } //----------------------------------------------------------------------------- template