[#1982] reverted changes

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index 6eb579d9c8cdafcb951cb3b69a32d7b96a4d930b..023067be11eaca0c4ac9ab53554c23d107cc3cb3 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -180,7 +180,7 @@ public:
                                           parameters);
 
     /// @brief Destructor.
-    ~MySqlConfigBackendDHCPv4Impl() = default;
+    ~MySqlConfigBackendDHCPv4Impl();
 
     /// @brief Sends query to retrieve global parameter.
     ///
@@ -3665,6 +3665,9 @@ MySqlConfigBackendDHCPv4Impl::MySqlConfigBackendDHCPv4Impl(const DatabaseConnect
     conn_.makeReconnectCtl(timer_name_);
 }
 
+MySqlConfigBackendDHCPv4Impl::~MySqlConfigBackendDHCPv4Impl() {
+}
+
 MySqlConfigBackendDHCPv4::MySqlConfigBackendDHCPv4(const DatabaseConnection::ParameterMap& parameters)
     : impl_(new MySqlConfigBackendDHCPv4Impl(parameters)), base_impl_(impl_) {
 }

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 2955f973e73dfd99866fee22762e0532661a915a..cf29082b31b7a36944214b7e9d7bbfd9ff370a03 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -188,7 +188,7 @@ public:
                                           parameters);
 
     /// @brief Destructor.
-    ~MySqlConfigBackendDHCPv6Impl() = default;
+    ~MySqlConfigBackendDHCPv6Impl();
 
     /// @brief Sends query to retrieve global parameter.
     ///
@@ -4130,6 +4130,9 @@ MySqlConfigBackendDHCPv6Impl::MySqlConfigBackendDHCPv6Impl(const DatabaseConnect
     conn_.makeReconnectCtl(timer_name_);
 }
 
+MySqlConfigBackendDHCPv6Impl::~MySqlConfigBackendDHCPv6Impl() {
+}
+
 MySqlConfigBackendDHCPv6::MySqlConfigBackendDHCPv6(const DatabaseConnection::ParameterMap& parameters)
     : impl_(new MySqlConfigBackendDHCPv6Impl(parameters)), base_impl_(impl_) {
 }

diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc
index 9deaa960dbe0a7bb5eb62fafd8b3289b45f4e09e..f3167f9617cc216bd23e92703e298e8a112cfbf5 100644 (file)
--- a/src/lib/dhcpsrv/mysql_host_data_source.cc
+++ b/src/lib/dhcpsrv/mysql_host_data_source.cc
@@ -2067,7 +2067,7 @@ public:
     MySqlHostDataSourceImpl(const DatabaseConnection::ParameterMap& parameters);
 
     /// @brief Destructor.
-    ~MySqlHostDataSourceImpl() = default;
+    ~MySqlHostDataSourceImpl();
 
     /// @brief Attempts to reconnect the server to the host DB backend manager.
     ///
@@ -2849,6 +2849,9 @@ MySqlHostDataSourceImpl::createContext() const {
     return (ctx);
 }
 
+MySqlHostDataSourceImpl::~MySqlHostDataSourceImpl() {
+}
+
 bool
 MySqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
     MultiThreadingCriticalSection cs;
@@ -3156,6 +3159,9 @@ MySqlHostDataSource::MySqlHostDataSource(const DatabaseConnection::ParameterMap&
     : impl_(new MySqlHostDataSourceImpl(parameters)) {
 }
 
+MySqlHostDataSource::~MySqlHostDataSource() {
+}
+
 DatabaseConnection::ParameterMap
 MySqlHostDataSource::getParameters() const {
     return (impl_->parameters_);

diff --git a/src/lib/dhcpsrv/mysql_host_data_source.h b/src/lib/dhcpsrv/mysql_host_data_source.h
index 3f677f11cd2f53c63b128964a96fa9075c1b35ac..879eb7e3b6b2a26e1d7f52aeb56b8de4d0cb2c48 100644 (file)
--- a/src/lib/dhcpsrv/mysql_host_data_source.h
+++ b/src/lib/dhcpsrv/mysql_host_data_source.h
@@ -68,7 +68,7 @@ public:
     /// @brief Virtual destructor.
     ///
     /// Releases prepared MySQL statements used by the backend.
-    virtual ~MySqlHostDataSource() = default;
+    virtual ~MySqlHostDataSource();
 
     /// @brief Return backend parameters
     ///

diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc
index db9204efb21552b02220ff1fb8076b124cdddd32..1817e574bf5ede5b35412fd6981eeebf4f683acb 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_host_data_source.cc
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc
@@ -1428,7 +1428,7 @@ public:
     PgSqlHostDataSourceImpl(const DatabaseConnection::ParameterMap& parameters);
 
     /// @brief Destructor.
-    ~PgSqlHostDataSourceImpl() = default;
+    ~PgSqlHostDataSourceImpl();
 
     /// @brief Attempts to reconnect the server to the host DB backend manager.
     ///
@@ -2284,6 +2284,9 @@ PgSqlHostDataSourceImpl::createContext() const {
     return (ctx);
 }
 
+PgSqlHostDataSourceImpl::~PgSqlHostDataSourceImpl() {
+}
+
 bool
 PgSqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
     MultiThreadingCriticalSection cs;
@@ -2564,6 +2567,9 @@ PgSqlHostDataSource::PgSqlHostDataSource(const DatabaseConnection::ParameterMap&
     : impl_(new PgSqlHostDataSourceImpl(parameters)) {
 }
 
+PgSqlHostDataSource::~PgSqlHostDataSource() {
+}
+
 DatabaseConnection::ParameterMap
 PgSqlHostDataSource::getParameters() const {
     return (impl_->parameters_);

diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.h b/src/lib/dhcpsrv/pgsql_host_data_source.h
index a62e109ab799948c308d53541d9d48de1aaf1720..1abada5757e3236e5bf48cd49d2dd70fa403f24b 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_host_data_source.h
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.h
@@ -73,7 +73,7 @@ public:
     ///
     /// Frees database resources and closes the database connection through
     /// the destruction of member impl_.
-    virtual ~PgSqlHostDataSource() = default;
+    virtual ~PgSqlHostDataSource();
 
     /// @brief Return backend parameters
     ///