From: Maxim Mamontov <faust.madf@gmail.com>
Date: Mon, 7 Oct 2013 21:28:02 +0000 (+0300)
Subject: Return value from assignment operator.
X-Git-Tag: 2.409~335
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/7a4fca71ae8e3bb963f8ebcf466911216ac7ec82

Return value from assignment operator.

Conflicts:
	include/stg/admin_conf.h
---

diff --git a/include/stg/admin_conf.h b/include/stg/admin_conf.h
index df6d9e22..28ceab66 100644
--- a/include/stg/admin_conf.h
+++ b/include/stg/admin_conf.h
@@ -75,6 +75,26 @@ struct ADMIN_CONF
     std::string   password;
 };
 //-----------------------------------------------------------------------------
+struct ADMIN_CONF_RES
+{
+    ADMIN_CONF_RES()
+    {}
+    ADMIN_CONF_RES(const ADMIN_CONF_RES & rhs)
+        : priv(rhs.priv),
+          login(rhs.login),
+          password(rhs.password)
+    {}
+    ADMIN_CONF_RES & operator=(const ADMIN_CONF_RES & rhs)
+    {
+        priv = rhs.priv;
+        login = rhs.login;
+        password = rhs.password;
+        return *this;
+    }
+    RESETABLE<PRIV> priv;
+    RESETABLE<std::string> login;
+    RESETABLE<std::string> password;
+};
 
 #include "admin_conf.inc.h"