Merge branch 'master' into full-month-stats

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

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 88506a2f646030b5ac2bd47e7593a12a9c5ff949..2fc2729e2aefc566e1a7cb443b3f2d9e0c7c4ed4 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -68,6 +68,9 @@ public:
     void Notify(const int & oldPassive, const int & newPassive);
 
 private:
     void Notify(const int & oldPassive, const int & newPassive);
 
 private:

+    CHG_PASSIVE_NOTIFIER(const CHG_PASSIVE_NOTIFIER & rvalue);
+    CHG_PASSIVE_NOTIFIER & operator=(const CHG_PASSIVE_NOTIFIER & rvalue);
+

     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------
     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------


@@ -78,6 +81,9 @@ public:
     void Notify(const std::string & oldTariff, const std::string & newTariff);
 
 private:
     void Notify(const std::string & oldTariff, const std::string & newTariff);
 
 private:

+    CHG_TARIFF_NOTIFIER(const CHG_TARIFF_NOTIFIER & rvalue);
+    CHG_TARIFF_NOTIFIER & operator=(const CHG_TARIFF_NOTIFIER & rvalue);
+

     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------
     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------


@@ -88,12 +94,18 @@ public:
     void Notify(const double & oldCash, const double & newCash);
 
 private:
     void Notify(const double & oldCash, const double & newCash);
 
 private:

+    CHG_CASH_NOTIFIER(const CHG_CASH_NOTIFIER & rvalue);
+    CHG_CASH_NOTIFIER & operator=(const CHG_CASH_NOTIFIER & rvalue);
+

     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------
 class CHG_IPS_NOTIFIER : public PROPERTY_NOTIFIER_BASE<USER_IPS>,
                          private NONCOPYABLE {
 public:
     USER_IMPL * user;
 };
 //-----------------------------------------------------------------------------
 class CHG_IPS_NOTIFIER : public PROPERTY_NOTIFIER_BASE<USER_IPS>,
                          private NONCOPYABLE {
 public:

+    CHG_IPS_NOTIFIER(const CHG_IPS_NOTIFIER & rvalue);
+    CHG_IPS_NOTIFIER & operator=(const CHG_IPS_NOTIFIER & rvalue);
+

     CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const USER_IPS & oldIPs, const USER_IPS & newIPs);
 
     CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}
     void Notify(const USER_IPS & oldIPs, const USER_IPS & newIPs);
 


@@ -307,7 +319,7 @@ private:
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
     CHG_TARIFF_NOTIFIER      tariffNotifier;
     CHG_CASH_NOTIFIER        cashNotifier;
     CHG_PASSIVE_NOTIFIER     passiveNotifier;
     CHG_TARIFF_NOTIFIER      tariffNotifier;
     CHG_CASH_NOTIFIER        cashNotifier;

-    CHG_IPS_NOTIFIER          ipNotifier;
+    CHG_IPS_NOTIFIER         ipNotifier;

 
     mutable pthread_mutex_t  mutex;
 
 
     mutable pthread_mutex_t  mutex;