Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / user_impl.h

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 7e14311ce6b09854b1cad7fcd5eee310d6cb4c59..c5b30a1d13ce373974ec53216f1157b3b280eb6f 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -33,6 +33,7 @@
 #include <vector>
 #include <string>
 #include <set>
 #include <vector>
 #include <string>
 #include <set>

+#include <mutex>

 
 #include <ctime>
 #include <cstdint>
 
 #include <ctime>
 #include <cstdint>


@@ -66,7 +67,6 @@ class UserImpl : public User
                   const Users * u,
                   const Services & svcs);
         UserImpl(const UserImpl & u);
                   const Users * u,
                   const Services & svcs);
         UserImpl(const UserImpl & u);

-        virtual ~UserImpl();

 
         int             ReadConf();
         int             ReadStat();
 
         int             ReadConf();
         int             ReadStat();


@@ -253,9 +253,11 @@ class UserImpl : public User
         ScopedConnection m_afterIPConn;
         void onIPChange(const UserIPs& oldVal, const UserIPs& newVal);
 
         ScopedConnection m_afterIPConn;
         void onIPChange(const UserIPs& oldVal, const UserIPs& newVal);
 

-        mutable pthread_mutex_t  mutex;
+        mutable std::mutex  m_mutex;

 
         std::string              errorStr;
 
         std::string              errorStr;

+
+        double getPassiveTimePart() const;

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