From 481f6f1aeae54e70d0c18a6ca3a02e6dbc8b6c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 11 May 2020 07:43:59 +0300 Subject: [PATCH] Add missing operator=(Connection&&) The move assignment should also be defined if the move construction is defined. --- .../maxtest/include/maxtest/mariadb_func.h | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/maxscale-system-test/maxtest/include/maxtest/mariadb_func.h b/maxscale-system-test/maxtest/include/maxtest/mariadb_func.h index e4586f399..b45254f5a 100644 --- a/maxscale-system-test/maxtest/include/maxtest/mariadb_func.h +++ b/maxscale-system-test/maxtest/include/maxtest/mariadb_func.h @@ -276,17 +276,30 @@ public: } Connection(Connection&& rhs) - : m_host(rhs.m_host) - , m_port(rhs.m_port) - , m_user(rhs.m_user) - , m_pw(rhs.m_pw) - , m_db(rhs.m_db) - , m_ssl(rhs.m_ssl) - , m_conn(rhs.m_conn) + : m_host(std::move(rhs.m_host)) + , m_port(std::move(rhs.m_port)) + , m_user(std::move(rhs.m_user)) + , m_pw(std::move(rhs.m_pw)) + , m_db(std::move(rhs.m_db)) + , m_ssl(std::move(rhs.m_ssl)) + , m_conn(std::move(rhs.m_conn)) { rhs.m_conn = nullptr; } + Connection& operator=(Connection&& rhs) + { + m_host = std::move(rhs.m_host); + m_port = std::move(rhs.m_port); + m_user = std::move(rhs.m_user); + m_pw = std::move(rhs.m_pw); + m_db = std::move(rhs.m_db); + m_ssl = std::move(rhs.m_ssl); + m_conn = std::move(rhs.m_conn); + rhs.m_conn = nullptr; + return *this; + } + virtual ~Connection() { mysql_close(m_conn);