From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 26 Feb 2015 17:44:28 +0000 (+0100)
Subject: [3728] WritableHostDataSource does not derive from the BaseHostDataSource.
X-Git-Tag: trac3733_base~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54e77b80c3b3329a30c857e62bf37f6b689f9d72;p=thirdparty%2Fkea.git

[3728] WritableHostDataSource does not derive from the BaseHostDataSource.
---

diff --git a/src/lib/dhcpsrv/base_host_data_source.h b/src/lib/dhcpsrv/base_host_data_source.h
index 162520e2e6..bcfb44d216 100644
--- a/src/lib/dhcpsrv/base_host_data_source.h
+++ b/src/lib/dhcpsrv/base_host_data_source.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -57,8 +57,7 @@ class BaseHostDataSource {
 public:
 
     /// @brief Default destructor implementation.
-    virtual ~BaseHostDataSource() {
-    }
+    virtual ~BaseHostDataSource() { }
 
     /// @brief Return all hosts for the specified HW address or DUID.
     ///
diff --git a/src/lib/dhcpsrv/cfg_hosts.h b/src/lib/dhcpsrv/cfg_hosts.h
index e3a8f23db8..77e560a584 100644
--- a/src/lib/dhcpsrv/cfg_hosts.h
+++ b/src/lib/dhcpsrv/cfg_hosts.h
@@ -18,6 +18,7 @@
 #include <asiolink/io_address.h>
 #include <dhcp/duid.h>
 #include <dhcp/hwaddr.h>
+#include <dhcpsrv/base_host_data_source.h>
 #include <dhcpsrv/host.h>
 #include <dhcpsrv/host_container.h>
 #include <dhcpsrv/subnet_id.h>
@@ -42,9 +43,12 @@ namespace dhcp {
 /// when the new configuration is applied for the server. The reservations
 /// are retrieved by the @c HostMgr class when the server is allocating or
 /// renewing an address or prefix for the particular client.
-class CfgHosts : public WritableHostDataSource {
+class CfgHosts : public BaseHostDataSource, public WritableHostDataSource {
 public:
 
+    /// @brief Destructor.
+    virtual ~CfgHosts() { }
+
     /// @brief Return all hosts for the specified HW address or DUID.
     ///
     /// This method returns all @c Host objects which represent reservations
diff --git a/src/lib/dhcpsrv/writable_host_data_source.h b/src/lib/dhcpsrv/writable_host_data_source.h
index c35a0b7f35..79a8cdf1af 100644
--- a/src/lib/dhcpsrv/writable_host_data_source.h
+++ b/src/lib/dhcpsrv/writable_host_data_source.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -15,22 +15,22 @@
 #ifndef WRITABLE_HOST_DATA_SOURCE_H
 #define WRITABLE_HOST_DATA_SOURCE_H
 
-#include <dhcpsrv/base_host_data_source.h>
-
 namespace isc {
 namespace dhcp {
 
 /// @brief Interface for retrieving writable host reservations.
 ///
-/// This interface extends the @c BaseHostDataSource with methods which return
-/// pointers to the @c Host objects, which can be modified.
-class WritableHostDataSource : public BaseHostDataSource {
+/// This interface specifies the methods which return pointers to the
+/// @c Host objects, which can be modified. Deriving from this interface
+/// is needed if the class implementation must return the pointers to the
+/// objects which may be modified by the caller. Such classes usually
+/// also derive from the @c BaseHostDataSource to implement methods which
+/// return the const objects.
+class WritableHostDataSource {
 public:
 
-    using BaseHostDataSource::getAll;
-    using BaseHostDataSource::getAll4;
-    using BaseHostDataSource::get4;
-    using BaseHostDataSource::get6;
+    /// @brief Default destructor implementation.
+    virtual ~WritableHostDataSource() { }
 
     /// @brief Non-const version of the @c getAll const method.
     ///