Added x2str for double type.

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index b871b36b61daa40054b3b99087243b5b7dc3dd50..15547b49122e4fa0ade9d6d98ab000e1c56cda14 100644 (file)
--- 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);
 }
 //---------------------------------------------------------------------------
 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");
 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 c4c7e1b7d499cba8b37bfc501833df85ab0e358b..b4b53530d512a94cc4021ce954892218eba7c886 100644 (file)
--- 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);
 
 
 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 <typename varT>
 int str2x(const std::string & str, varT & x);
 template <typename varT>
 template <typename varT>
 int str2x(const std::string & str, varT & x);
 template <typename varT>


@@ -243,16 +257,6 @@ const std::string & unsigned2str(varT x, std::string & s)
     return 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 *);
 
 char * stg_strptime(const char *, const char *, struct tm *);
 time_t stg_timegm(struct tm *);