Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / admin_impl.cpp

diff --git a/projects/stargazer/admin_impl.cpp b/projects/stargazer/admin_impl.cpp
index 7f1b301fc3ee920d75c9b13677323db2bc77a3fb..9788cec4c76d58af2c4b0fbf2737f53c44847264 100644 (file)
--- a/projects/stargazer/admin_impl.cpp
+++ b/projects/stargazer/admin_impl.cpp
@@ -29,69 +29,53 @@
  */
 
 #include "admin_impl.h"
  */
 
 #include "admin_impl.h"

+

 #include "stg/common.h"
 
 //-----------------------------------------------------------------------------
 ADMIN_IMPL::ADMIN_IMPL()
 #include "stg/common.h"
 
 //-----------------------------------------------------------------------------
 ADMIN_IMPL::ADMIN_IMPL()

-    : ADMIN(),
-      conf(),
-      ip(0),
-      WriteServLog(GetStgLogger())
+    : ip(0)

 {
 }
 //-----------------------------------------------------------------------------
 ADMIN_IMPL::ADMIN_IMPL(const ADMIN_CONF & ac)
 {
 }
 //-----------------------------------------------------------------------------
 ADMIN_IMPL::ADMIN_IMPL(const ADMIN_CONF & ac)

-    : ADMIN(),
-      conf(ac),
-      ip(0),
-      WriteServLog(GetStgLogger())
+    : conf(ac),
+      ip(0)

 {
 }
 //-----------------------------------------------------------------------------
 ADMIN_IMPL::ADMIN_IMPL(const PRIV & priv,
                        const std::string & login,
                        const std::string & password)
 {
 }
 //-----------------------------------------------------------------------------
 ADMIN_IMPL::ADMIN_IMPL(const PRIV & priv,
                        const std::string & login,
                        const std::string & password)

-    : ADMIN(),
-      conf(priv, login, password),
-      ip(0),
-      WriteServLog(GetStgLogger())
-{
-}
-//-----------------------------------------------------------------------------
-ADMIN & ADMIN_IMPL::operator=(const ADMIN & adm)
+    : conf(priv, login, password),
+      ip(0)

 {
 {

-if (&adm == this)
-    return *this;
-
-conf = adm.GetConf();
-ip = adm.GetIP();
-return *this;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-ADMIN & ADMIN_IMPL::operator=(const ADMIN_CONF & ac)
+ADMIN_IMPL & ADMIN_IMPL::operator=(const ADMIN_CONF & ac)

 {
 conf = ac;
 return *this;
 }
 //-----------------------------------------------------------------------------
 {
 conf = ac;
 return *this;
 }
 //-----------------------------------------------------------------------------

-bool ADMIN_IMPL::operator==(const ADMIN & rhs) const
+bool ADMIN_IMPL::operator==(const ADMIN_IMPL & rhs) const

 {
 {

-return conf.login == rhs.GetLogin();
+return conf.login == rhs.conf.login;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-bool ADMIN_IMPL::operator!=(const ADMIN & rhs) const
+bool ADMIN_IMPL::operator!=(const ADMIN_IMPL & rhs) const

 {
 {

-return conf.login != rhs.GetLogin();
+return conf.login != rhs.conf.login;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-bool ADMIN_IMPL::operator<(const ADMIN & rhs) const
+bool ADMIN_IMPL::operator<(const ADMIN_IMPL & rhs) const

 {
 {

-return conf.login < rhs.GetLogin();
+return conf.login < rhs.conf.login;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-bool ADMIN_IMPL::operator<=(const ADMIN & rhs) const
+bool ADMIN_IMPL::operator<=(const ADMIN_IMPL & rhs) const

 {
 {

-return conf.login <= rhs.GetLogin();
+return conf.login <= rhs.conf.login;

 }
 //-----------------------------------------------------------------------------
 std::string ADMIN_IMPL::GetIPStr() const
 }
 //-----------------------------------------------------------------------------
 std::string ADMIN_IMPL::GetIPStr() const