Merge branch 'stg-2.409'

diff --cc include/stg/admin_conf.h
Simple merge

diff --cc include/stg/corp_conf.h
Simple merge

diff --cc include/stg/user_traff.h
index 8ef8e2608f8d3f2f569a7bb8cd4800e57a739b7b,d820588e3702d412436635474996da7d1a78b2c1..3ca9768ef185bc4f8d49be1d4a28658198846a57
--- 1/include/stg/user_traff.h
--- 2/include/stg/user_traff.h
+++ b/include/stg/user_traff.h
@@@ -92,9 -89,14 +90,15 @@@ public
      for (IndexType i = 0; i < ts.size(); ++i)
          traff[i] = ts[i];
      }
+     DIR_TRAFF_RES & operator=(const DIR_TRAFF & ts)
+     {
+         for (IndexType i = 0; i < ts.size(); ++i)
+             traff[i] = ts[i];
+         return *this;
+     }
      const ValueType & operator[](IndexType idx) const { return traff[idx]; }
      ValueType & operator[](IndexType idx) { return traff[idx]; }
 +    IndexType size() const { return traff.size(); }
      DIR_TRAFF GetData() const
      {
      DIR_TRAFF res;

diff --cc projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
Simple merge

diff --cc projects/stargazer/plugins/configuration/sgconfig/configproto.h
index c464e95ee5c3b76481d0e50e37dfe9cc2f66f2cc,f80735754c6bb951e97258eb27c9b50729488a0d..87a5ef79dc59ef688eb149e77f47ad3da902b438
--- 1/projects/stargazer/plugins/configuration/sgconfig/configproto.h
--- 2/projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@@ -52,23 -50,21 +52,23 @@@ class Conn
  
  class CONFIGPROTO {
  public:
-     CONFIGPROTO(PLUGIN_LOGGER & l);
+     explicit CONFIGPROTO(PLUGIN_LOGGER & l);
      ~CONFIGPROTO();
  
 -    void            SetPort(uint16_t port) { m_port = port; }
 -    void            SetBindAddress(const std::string & address) { m_bindAddress = address; }
 -    void            SetSettings(const SETTINGS * settings) { m_settings = settings; }
 -    void            SetAdmins(ADMINS * admins) { m_admins = admins; }
 -    void            SetTariffs(TARIFFS * tariffs) { m_tariffs = tariffs; }
 -    void            SetUsers(USERS * users) { m_users = users; }
 -    void            SetStore(STORE * store) { m_store = store; }
 -
 -    int             Prepare();
 -    int             Stop();
 +    void SetPort(uint16_t port) { m_port = port; }
 +    void SetBindAddress(const std::string & address) { m_bindAddress = address; }
 +    void SetSettings(const SETTINGS * settings) { m_settings = settings; }
 +    void SetAdmins(ADMINS * admins) { m_admins = admins; }
 +    void SetTariffs(TARIFFS * tariffs) { m_tariffs = tariffs; }
 +    void SetUsers(USERS * users) { m_users = users; }
 +    void SetStore(STORE * store) { m_store = store; }
 +    void SetServices(SERVICES * services) { m_services = services; }
 +    void SetCorporations(CORPORATIONS * corporations) { m_corporations = corporations; }
 +
 +    int Prepare();
 +    int Stop();
      const std::string & GetStrError() const { return m_errorStr; }
 -    void            Run();
 +    void Run();
  
  private:
      CONFIGPROTO(const CONFIGPROTO & rvalue);

diff --cc projects/stargazer/plugins/store/files/file_store.cpp
Simple merge

diff --cc projects/stargazer/settings_impl.h
Simple merge

diff --cc projects/stargazer/user_impl.cpp
Simple merge

diff --cc projects/stargazer/user_impl.h
Simple merge

diff --cc projects/stargazer/users_impl.cpp
Simple merge