Fixed formatting.

[stg.git] / 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 f2e4e7e2432ab52aa75ed29efbe684726a7fe5ea..0437d67223f6288eb60ed2e877ad70530a6697c2 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -77,6 +77,7 @@ int             DaysInCurrentMonth();
 int             Min8(int a);
 std::string     inet_ntostring(uint32_t);
 uint32_t        inet_strington(const std::string & value);
 int             Min8(int a);
 std::string     inet_ntostring(uint32_t);
 uint32_t        inet_strington(const std::string & value);

+std::string     TimeToString(time_t time);

 int             strprintf(std::string * str, const char * fmt, ...);
 int             ParseTariffTimeStr(const char * str, int &h1, int &m1, int &h2, int &m2);
 uint32_t        CalcMask(uint32_t msk);
 int             strprintf(std::string * str, const char * fmt, ...);
 int             ParseTariffTimeStr(const char * str, int &h1, int &m1, int &h2, int &m2);
 uint32_t        CalcMask(uint32_t msk);


@@ -114,6 +115,8 @@ bool WaitPackets(int sd);
 //-----------------------------------------------------------------------------
 int str2x(const std::string & str, int32_t & x);
 int str2x(const std::string & str, uint32_t & x);
 //-----------------------------------------------------------------------------
 int str2x(const std::string & str, int32_t & x);
 int str2x(const std::string & str, uint32_t & x);

+inline
+int str2x(const std::string & str, double & x) { return strtodouble2(str.c_str(), x); }

 #ifndef WIN32
 int str2x(const std::string & str, int64_t & x);
 int str2x(const std::string & str, uint64_t & x);
 #ifndef WIN32
 int str2x(const std::string & str, int64_t & x);
 int str2x(const std::string & str, uint64_t & x);