From 7a4fca71ae8e3bb963f8ebcf466911216ac7ec82 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Tue, 8 Oct 2013 00:28:02 +0300 Subject: [PATCH] Return value from assignment operator. Conflicts: include/stg/admin_conf.h --- include/stg/admin_conf.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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; + RESETABLE login; + RESETABLE password; +}; #include "admin_conf.inc.h" -- 2.43.2