Fixed compilation issues.

[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 ac0911472778ea25e543acd883341a4f2437b7e7..eb0d14a625343b00f41bc53131fd2631d927075d 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -52,7 +52,7 @@
 #define ST_MB   3
 
 //-----------------------------------------------------------------------------
 #define ST_MB   3
 
 //-----------------------------------------------------------------------------

-const char    * IntToKMG(long long a, int statType = ST_F);
+const char    * IntToKMG(int64_t a, int statType = ST_F);

 const char    * LogDate(time_t t);
 int             ParesTimeStat(const char * str);
 int             IsTimeStat(struct tm * t, int statTime);
 const char    * LogDate(time_t t);
 int             ParesTimeStat(const char * str);
 int             IsTimeStat(struct tm * t, int statTime);


@@ -107,8 +107,20 @@ int ParseYesNo(const std::string & str, bool * val);
 
 bool WaitPackets(int sd);
 
 
 bool WaitPackets(int sd);
 

+template <typename varT>
+int str2x(const std::string & str, varT & x);
+template <typename varT>
+const std::string & x2str(varT x, std::string & s);
+template <typename varT>
+const std::string & x2str(varT x) { std::string s; return x2str(x, s); }
+template <typename varT>
+const std::string & unsigned2str(varT x, std::string & s);
+template <typename varT>
+const std::string & unsigned2str(varT x) { std::string s; return unsigned2str(x, s); }
+

 //-----------------------------------------------------------------------------
 template <typename varT>
 //-----------------------------------------------------------------------------
 template <typename varT>

+inline

 int str2x(const std::string & str, varT & x)
 {
     int pos = 0;
 int str2x(const std::string & str, varT & x)
 {
     int pos = 0;


@@ -146,6 +158,7 @@ int str2x(const std::string & str, varT & x)
 }
 //-----------------------------------------------------------------------------
 template <typename varT>
 }
 //-----------------------------------------------------------------------------
 template <typename varT>

+inline

 const std::string & x2str(varT x, std::string & s)
 {
     varT xx = x;
 const std::string & x2str(varT x, std::string & s)
 {
     varT xx = x;


@@ -191,6 +204,7 @@ const std::string & x2str(varT x, std::string & s)
 }
 //-----------------------------------------------------------------------------
 template <typename varT>
 }
 //-----------------------------------------------------------------------------
 template <typename varT>

+inline

 const std::string & unsigned2str(varT x, std::string & s)
 {
     varT xx = x;
 const std::string & unsigned2str(varT x, std::string & s)
 {
     varT xx = x;


@@ -226,18 +240,15 @@ const std::string & unsigned2str(varT x, std::string & s)
     return s;
 }
 //-----------------------------------------------------------------------------
     return s;
 }
 //-----------------------------------------------------------------------------

-int str2x(const std::string & str, int & x);
-int str2x(const std::string & str, unsigned & x);
-int str2x(const std::string & str, long & x);
-int str2x(const std::string & str, unsigned long & x);
+int str2x(const std::string & str, int32_t & x);
+int str2x(const std::string & str, uint32_t & x);

 #ifndef WIN32
 #ifndef WIN32

-int str2x(const std::string & str, long long & x);
-int str2x(const std::string & str, unsigned long long & x);
+int str2x(const std::string & str, int64_t & x);
+int str2x(const std::string & str, uint64_t & x);

 #endif
 //-----------------------------------------------------------------------------
 #endif
 //-----------------------------------------------------------------------------

-const std::string & x2str(unsigned x, std::string & s);
-const std::string & x2str(unsigned long x, std::string & s);
-const std::string & x2str(unsigned long long x, std::string & s);
+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 *);