USER_STAT refactoring.

[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 6df89f73a7da67ad0e2347db213f007246e844aa..524a3431a6ea3112d86af0f9846926c1bc6a16cf 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -65,6 +65,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);
 
 void            Encode12str(std::string & dst, const std::string & src);
 void            Decode21str(std::string & dst, const std::string & src);

+std::string     Encode12str(const std::string & src);
+std::string     Decode21str(const std::string & src);

 
 int             ParseIPString(const char * str, uint32_t * ips, int maxIP);
 void            KOIToWin(const char * s1, char * s2, int l);
 
 int             ParseIPString(const char * str, uint32_t * ips, int maxIP);
 void            KOIToWin(const char * s1, char * s2, int l);


@@ -115,11 +117,11 @@ int str2x(const std::string & str, varT & x);
 template <typename varT>
 const std::string & x2str(varT x, std::string & s);
 template <typename varT>
 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); }
+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>
 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); }
+std::string unsigned2str(varT x) { std::string s; return unsigned2str(x, s); }

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


@@ -155,7 +157,7 @@ int str2x(const std::string & str, varT & x)
         x += str[i] - '0';
     }
 
         x += str[i] - '0';
     }
 

-    x*= minus;
+    x *= minus;

 
     return 0;
 }
 
     return 0;
 }