From: Maxim Mamontov Date: Sun, 20 Oct 2013 08:44:41 +0000 (+0300) Subject: Added x2str for double type. X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/d8ed3c9a80357e890fe4a927b92437e8f88b6b7c?hp=3f044094a85b8542286107bd6a9da921fc990681 Added x2str for double type. --- diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp index b871b36b..15547b49 100644 --- a/stglibs/common.lib/common.cpp +++ b/stglibs/common.lib/common.cpp @@ -804,6 +804,13 @@ const std::string & x2str(uint64_t x, std::string & s) return unsigned2str(x, s); } //--------------------------------------------------------------------------- +const std::string & x2str(double x, std::string & s) +{ +char buf[256]; +s = snprintf(buf, sizeof(buf), "%f", x); +return s; +} +//--------------------------------------------------------------------------- std::string & TrimL(std::string & val) { size_t pos = val.find_first_not_of(" \t"); diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h index c4c7e1b7..b4b53530 100644 --- a/stglibs/common.lib/include/stg/common.h +++ b/stglibs/common.lib/include/stg/common.h @@ -110,6 +110,20 @@ int ParseYesNo(const std::string & str, bool * val); bool WaitPackets(int sd); +//----------------------------------------------------------------------------- +int str2x(const std::string & str, int32_t & x); +int str2x(const std::string & str, uint32_t & x); +#ifndef WIN32 +int str2x(const std::string & str, int64_t & x); +int str2x(const std::string & str, uint64_t & x); +#endif +//----------------------------------------------------------------------------- +const std::string & x2str(uint32_t x, std::string & s); +const std::string & x2str(uint64_t x, std::string & s); +//----------------------------------------------------------------------------- +const std::string & x2str(double x, std::string & s); +//----------------------------------------------------------------------------- + template int str2x(const std::string & str, varT & x); template @@ -243,16 +257,6 @@ const std::string & unsigned2str(varT x, std::string & s) return s; } //----------------------------------------------------------------------------- -int str2x(const std::string & str, int32_t & x); -int str2x(const std::string & str, uint32_t & x); -#ifndef WIN32 -int str2x(const std::string & str, int64_t & x); -int str2x(const std::string & str, uint64_t & x); -#endif -//----------------------------------------------------------------------------- -const std::string & x2str(uint32_t x, std::string & s); -const std::string & x2str(uint64_t x, std::string & s); -//----------------------------------------------------------------------------- char * stg_strptime(const char *, const char *, struct tm *); time_t stg_timegm(struct tm *);