Types mismatch fixed

[stg.git] / stglibs / pinger.lib / pinger.h

diff --git a/stglibs/pinger.lib/pinger.h b/stglibs/pinger.lib/pinger.h
index 1398332d9badd416debebcdda0ff1e8685ed4048..b1b777813fc617f0710ae51799a76b3c80a2f804 100644 (file)
--- a/stglibs/pinger.lib/pinger.h
+++ b/stglibs/pinger.lib/pinger.h
@@ -9,7 +9,6 @@
 
 #include <ctime>
 #include <string>
 
 #include <ctime>
 #include <string>

-#include <vector>

 #include <list>
 #include <map>
 
 #include <list>
 #include <map>
 


@@ -28,9 +27,7 @@
 #include <arpa/inet.h>
 #endif
 
 #include <arpa/inet.h>
 #endif
 

-#include "os_int.h"
-
-using namespace std;
+#include "stg/os_int.h"

 
 //-----------------------------------------------------------------------------
 struct ICMP_HDR
 
 //-----------------------------------------------------------------------------
 struct ICMP_HDR


@@ -95,12 +92,11 @@ public:
     void    AddIP(uint32_t ip);
     void    DelIP(uint32_t ip);
     int     GetPingIPNum() const;
     void    AddIP(uint32_t ip);
     void    DelIP(uint32_t ip);
     int     GetPingIPNum() const;

-    //void    GetAllIP(vector<PING_IP_TIME> * ipTime) const;

     void    PrintAllIP();
     int     GetIPTime(uint32_t ip, time_t * t) const;
     void    PrintAllIP();
     int     GetIPTime(uint32_t ip, time_t * t) const;

-    void    SetDelayTime(time_t delay);
-    time_t  GetDelayTime() const;
-    string  GetStrError() const;
+    void    SetDelayTime(time_t d) { delay = d; }
+    time_t  GetDelayTime() const { return delay; }
+    const std::string & GetStrError() const { return errorStr; }

 
 private:
     uint16_t    PingCheckSum(void * data, int len);
 
 private:
     uint16_t    PingCheckSum(void * data, int len);


@@ -124,11 +120,11 @@ private:
     PING_MESSAGE pmSend;
     uint32_t    pid;
 
     PING_MESSAGE pmSend;
     uint32_t    pid;
 

-    string      errorStr;
+    std::string errorStr;

 
 

-    multimap<uint32_t, time_t>   pingIP;
-    list<uint32_t>          ipToAdd;
-    list<uint32_t>          ipToDel;
+    std::multimap<uint32_t, time_t> pingIP;
+    std::list<uint32_t>          ipToAdd;
+    std::list<uint32_t>          ipToDel;

 
     mutable pthread_mutex_t mutex;
 };
 
     mutable pthread_mutex_t mutex;
 };