Backported some changes from 2.5.

[stg.git] / projects / sgauth / web.h

diff --git a/projects/sgauth/web.h b/projects/sgauth/web.h
index a4dfcb48d31305581466683b2d30799a27f06530..a933230a58df1e9cec1fe74de84cfc4bfac793b1 100644 (file)
--- a/projects/sgauth/web.h
+++ b/projects/sgauth/web.h
@@ -39,17 +39,15 @@
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>
 

-#include "stg/stg_const.h"
+#include "stg/const.h"

 #include "stg/ia_packets.h"
 
 #include "stg/ia_packets.h"
 

-using namespace std;
-

 #define MAX_MESSAGES    (10)
 //-----------------------------------------------------------------------------
 struct STG_MESSAGE
 {
 #define MAX_MESSAGES    (10)
 //-----------------------------------------------------------------------------
 struct STG_MESSAGE
 {

-string  msg;
-string  recvTime;
+std::string  msg;
+std::string  recvTime;

 int     type;
 };
 //-----------------------------------------------------------------------------
 int     type;
 };
 //-----------------------------------------------------------------------------


@@ -58,10 +56,10 @@ class WEB
 public:
     WEB();
     void Run();
 public:
     WEB();
     void Run();

-    void SetDirName(const string & dn, int n);
+    void SetDirName(const std::string & dn, int n);

     void SetRefreshPagePeriod(int p);
     void SetListenAddr(uint32_t ip);
     void SetRefreshPagePeriod(int p);
     void SetListenAddr(uint32_t ip);

-    void AddMessage(const string & message, int type);
+    void AddMessage(const std::string & message, int type);

     void UpdateStat(const LOADSTAT & ls);
     void Start();
 private:
     void UpdateStat(const LOADSTAT & ls);
     void Start();
 private:


@@ -76,7 +74,7 @@ private:
     pthread_t thread;
     #endif
 
     pthread_t thread;
     #endif
 

-    string dirName[DIR_NUM];
+    std::string dirName[DIR_NUM];

     int res;
     int listenSocket;
     int outerSocket;
     int res;
     int listenSocket;
     int outerSocket;


@@ -85,6 +83,6 @@ private:
     uint32_t listenWebAddr;
     LOADSTAT ls;
 
     uint32_t listenWebAddr;
     LOADSTAT ls;
 

-    list<STG_MESSAGE> messages;
+    std::list<STG_MESSAGE> messages;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------