Hide or add proper copy ctor and assignement operator, initialize

members via initialization lists in core code

diff --git a/projects/stargazer/admins_impl.cpp b/projects/stargazer/admins_impl.cpp
index a780fcb316b80c7145b09e73b1c91f0218378c19..cef8682dd2fda9e32eb470147849579011b730dd 100644 (file)
--- a/projects/stargazer/admins_impl.cpp
+++ b/projects/stargazer/admins_impl.cpp
@@ -47,7 +47,9 @@ ADMINS_IMPL::ADMINS_IMPL(STORE * st)
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),

-      handle(0)
+      handle(0),
+      mutex(),
+      strError()

 {
 pthread_mutex_init(&mutex, NULL);
 Read();
 {
 pthread_mutex_init(&mutex, NULL);
 Read();

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index a1ca0f9859867a455eb79ab1fd1e8512cd90c739..cb00368c18543d75c9a72e596d8f6d6b993f6587 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -70,6 +70,9 @@ public:
     int CloseSearch(int) const;
 
 private:
     int CloseSearch(int) const;
 
 private:

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

     typedef list<ADMIN_IMPL>::iterator admin_iter;
     typedef list<ADMIN_IMPL>::const_iterator const_admin_iter;
 
     typedef list<ADMIN_IMPL>::iterator admin_iter;
     typedef list<ADMIN_IMPL>::const_iterator const_admin_iter;
 

diff --git a/projects/stargazer/corps_impl.cpp b/projects/stargazer/corps_impl.cpp
index 456523dc500af8250e664584b7daa8252523e452..f926d23a9276b2f9f8cb04104796f07f3b01b188 100644 (file)
--- a/projects/stargazer/corps_impl.cpp
+++ b/projects/stargazer/corps_impl.cpp
@@ -33,7 +33,9 @@ CORPORATIONS_IMPL::CORPORATIONS_IMPL(STORE * st)
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),

-      handle(0)
+      handle(0),
+      mutex(),
+      strError()

 {
 pthread_mutex_init(&mutex, NULL);
 Read();
 {
 pthread_mutex_init(&mutex, NULL);
 Read();

diff --git a/projects/stargazer/corps_impl.h b/projects/stargazer/corps_impl.h
index f19084f106967e2019b41ae5240b74565244a123..e4552424219c72e3aab74b25dacb69649456451f 100644 (file)
--- a/projects/stargazer/corps_impl.h
+++ b/projects/stargazer/corps_impl.h
@@ -55,18 +55,21 @@ public:
     int CloseSearch(int) const;
 
 private:
     int CloseSearch(int) const;
 
 private:

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

     typedef list<CORP_CONF>::iterator       crp_iter;
     typedef list<CORP_CONF>::const_iterator const_crp_iter;
 
     bool Read();
 
     std::list<CORP_CONF> data;
     typedef list<CORP_CONF>::iterator       crp_iter;
     typedef list<CORP_CONF>::const_iterator const_crp_iter;
 
     bool Read();
 
     std::list<CORP_CONF> data;

-    STORE *                 store;
-    STG_LOGGER &            WriteServLog;
+    STORE * store;
+    STG_LOGGER & WriteServLog;

     mutable std::map<int, const_crp_iter> searchDescriptors;
     mutable std::map<int, const_crp_iter> searchDescriptors;

-    mutable unsigned int    handle;
+    mutable unsigned int handle;

     mutable pthread_mutex_t mutex;
     mutable pthread_mutex_t mutex;

-    std::string             strError;
+    std::string strError;

 };
 
 #endif
 };
 
 #endif

diff --git a/projects/stargazer/services_impl.cpp b/projects/stargazer/services_impl.cpp
index f7fd1d490df2e62572c2804a1859788b7ca5d680..85b0f4e51105f0cf01bea9dddcb7da40aa560626 100644 (file)
--- a/projects/stargazer/services_impl.cpp
+++ b/projects/stargazer/services_impl.cpp
@@ -33,7 +33,9 @@ SERVICES_IMPL::SERVICES_IMPL(STORE * st)
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),

-      handle(0)
+      handle(0),
+      mutex(),
+      strError()

 {
 pthread_mutex_init(&mutex, NULL);
 Read();
 {
 pthread_mutex_init(&mutex, NULL);
 Read();

diff --git a/projects/stargazer/services_impl.h b/projects/stargazer/services_impl.h
index 148676d74e1fdf17f7ed726bfbf64188d636f6fa..2bb9c8797c44a8d00f5c5b536f37436053e84913 100644 (file)
--- a/projects/stargazer/services_impl.h
+++ b/projects/stargazer/services_impl.h
@@ -55,6 +55,9 @@ public:
     int CloseSearch(int) const;
 
 private:
     int CloseSearch(int) const;
 
 private:

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

     typedef list<SERVICE_CONF>::iterator       srv_iter;
     typedef list<SERVICE_CONF>::const_iterator const_srv_iter;
 
     typedef list<SERVICE_CONF>::iterator       srv_iter;
     typedef list<SERVICE_CONF>::const_iterator const_srv_iter;
 

diff --git a/projects/stargazer/store_loader.h b/projects/stargazer/store_loader.h
index c7911eead81adc97044f0b06cf45f42fd89cb00c..fd8b54a3f992ae2efab8cf26ea4f10a59085bccb 100644 (file)
--- a/projects/stargazer/store_loader.h
+++ b/projects/stargazer/store_loader.h
@@ -50,7 +50,11 @@ public:
     STORE * GetStore() { return plugin; }
 
     const std::string & GetStrError() const { return errorStr; }
     STORE * GetStore() { return plugin; }
 
     const std::string & GetStrError() const { return errorStr; }

+

 private:
 private:

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

     bool isLoaded;
     void * handle;
     STORE * plugin;
     bool isLoaded;
     void * handle;
     STORE * plugin;

diff --git a/projects/stargazer/tariffs_impl.cpp b/projects/stargazer/tariffs_impl.cpp
index ea3632cb376cf437b4f2d932cdc903fccb3069a1..ab3d970fa38f650edd5aa4e9ff5d320c745fa0cb 100644 (file)
--- a/projects/stargazer/tariffs_impl.cpp
+++ b/projects/stargazer/tariffs_impl.cpp
@@ -46,6 +46,7 @@ TARIFFS_IMPL::TARIFFS_IMPL(STORE * st)
       tariffs(),
       store(st),
       WriteServLog(GetStgLogger()),
       tariffs(),
       store(st),
       WriteServLog(GetStgLogger()),

+      mutex(),

       strError(),
       noTariff(NO_TARIFF_NAME),
       onAddNotifiers(),
       strError(),
       noTariff(NO_TARIFF_NAME),
       onAddNotifiers(),

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index b50c2f10491c4dd05d8268180db702cbcad60c63..caeb811d954bdafe9d277f44a0077987e1d6a005 100644 (file)
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -64,7 +64,11 @@ public:
     void    GetTariffsData(std::list<TARIFF_DATA> * tdl);
 
     const std::string & GetStrError() const { return strError; }
     void    GetTariffsData(std::list<TARIFF_DATA> * tdl);
 
     const std::string & GetStrError() const { return strError; }

+

 private:
 private:

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

     std::list<TARIFF_IMPL>  tariffs;
     STORE *                 store;
     STG_LOGGER &            WriteServLog;
     std::list<TARIFF_IMPL>  tariffs;
     STORE *                 store;
     STG_LOGGER &            WriteServLog;

diff --git a/projects/stargazer/traffcounter_impl.h b/projects/stargazer/traffcounter_impl.h
index 7afada49bfd494d0adabdafa66e354c4685e76b6..2a9fca5a61590dddb0bd4bb716a028e20f989fd8 100644 (file)
--- a/projects/stargazer/traffcounter_impl.h
+++ b/projects/stargazer/traffcounter_impl.h
@@ -198,6 +198,9 @@ public:
     size_t      RulesCount() const { return rules.size(); }
 
 private:
     size_t      RulesCount() const { return rules.size(); }
 
 private:

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

     bool        ParseAddress(const char * ta, RULE * rule) const;
     uint32_t    CalcMask(uint32_t msk) const;
     void        FreeRules();
     bool        ParseAddress(const char * ta, RULE * rule) const;
     uint32_t    CalcMask(uint32_t msk) const;
     void        FreeRules();

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 7aab735d41ddde04c2bc3242c949bf0e52ee360a..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);
 

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index a7af2989bac63961bfb0f4265a20f2a09ace4dbe..69f3fbae8d9aca286e1aa9d1ae9f3ac0c9cc04c6 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -56,26 +56,6 @@ typedef std::list<USER_IMPL>::const_iterator const_user_iter;
 
 class USERS_IMPL;
 //-----------------------------------------------------------------------------
 
 class USERS_IMPL;
 //-----------------------------------------------------------------------------

-/*class PROPERTY_NOTIFER_IP_BEFORE: public PROPERTY_NOTIFIER_BASE<uint32_t> {
-public:
-    PROPERTY_NOTIFER_IP_BEFORE(USERS_IMPL & us, user_iter u) : users(us), user(u) {}
-    void        Notify(const uint32_t & oldValue, const uint32_t & newValue);
-    user_iter   GetUser() const { return user; }
-private:
-    USERS_IMPL & users;
-    user_iter    user;
-};
-//-----------------------------------------------------------------------------
-class PROPERTY_NOTIFER_IP_AFTER: public PROPERTY_NOTIFIER_BASE<uint32_t> {
-public:
-    PROPERTY_NOTIFER_IP_AFTER(USERS_IMPL & us, user_iter u) : users(us), user(u) {}
-    void        Notify(const uint32_t & oldValue, const uint32_t & newValue);
-    user_iter   GetUser() const { return user; }
-private:
-    USERS_IMPL & users;
-    user_iter    user;
-};*/
-//-----------------------------------------------------------------------------

 struct USER_TO_DEL {
 USER_TO_DEL()
     : iter(),
 struct USER_TO_DEL {
 USER_TO_DEL()
     : iter(),


@@ -133,6 +113,9 @@ public:
     int             Stop();
 
 private:
     int             Stop();
 
 private:

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

     void            AddToIPIdx(user_iter user);
     void            DelFromIPIdx(uint32_t ip);
     bool            FindByIPIdx(uint32_t ip, user_iter & iter) const;
     void            AddToIPIdx(user_iter user);
     void            DelFromIPIdx(uint32_t ip);
     bool            FindByIPIdx(uint32_t ip, user_iter & iter) const;