From 8de9424e3c89612a8e8383ad72688ad3627087ac Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 27 Sep 2018 11:28:33 +0200
Subject: [PATCH] [#65,!26] Removed virtual inheritance.

---
 src/lib/yang/translator_option_def.cc | 3 +--
 src/lib/yang/translator_option_def.h  | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/lib/yang/translator_option_def.cc b/src/lib/yang/translator_option_def.cc
index 47e279cd05..d4dd3010d0 100644
--- a/src/lib/yang/translator_option_def.cc
+++ b/src/lib/yang/translator_option_def.cc
@@ -130,8 +130,7 @@ TranslatorOptionDef::setOptionDefKea(const string& xpath,
 
 TranslatorOptionDefList::TranslatorOptionDefList(S_Session session,
                                                  const string& model)
-    : TranslatorBasic(session), TranslatorOptionDef(session, model),
-      model_(model) {
+    : TranslatorOptionDef(session, model) {
 }
 
 TranslatorOptionDefList::~TranslatorOptionDefList() {
diff --git a/src/lib/yang/translator_option_def.h b/src/lib/yang/translator_option_def.h
index 31027bdaff..2110c2ef13 100644
--- a/src/lib/yang/translator_option_def.h
+++ b/src/lib/yang/translator_option_def.h
@@ -76,7 +76,7 @@ namespace yang {
 ///
 /// Currently supports kea-dhcp[46]-server models.
 /// @todo: Support for ietf-dhcpv6-server model.
-class TranslatorOptionDef : virtual public TranslatorBasic {
+class TranslatorOptionDef : public TranslatorBasic {
 public:
 
     /// @brief Constructor.
@@ -169,9 +169,6 @@ protected:
     /// @throw BadValue on option definition without code or space.
     void setOptionDefListKea(const std::string& xpath,
                              isc::data::ConstElementPtr elem);
-
-    /// @brief The model.
-    std::string model_;
 };
 
 }; // end of namespace isc::yang
-- 
2.47.2