From: Francis Dupont <fdupont@isc.org>
Date: Thu, 27 Sep 2018 11:02:23 +0000 (+0200)
Subject: [65-libyang-option-def] Revert "[#65,!26] Removed virtual inheritance."
X-Git-Tag: 65-libyang-class_base^2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b06ed07d3efb270bfca3c1ccde737415a2ac802;p=thirdparty%2Fkea.git

[65-libyang-option-def] Revert "[#65,!26] Removed virtual inheritance."

This reverts commit 8de9424e3c89612a8e8383ad72688ad3627087ac.
---

diff --git a/src/lib/yang/translator_option_def.cc b/src/lib/yang/translator_option_def.cc
index d4dd3010d0..47e279cd05 100644
--- a/src/lib/yang/translator_option_def.cc
+++ b/src/lib/yang/translator_option_def.cc
@@ -130,7 +130,8 @@ TranslatorOptionDef::setOptionDefKea(const string& xpath,
 
 TranslatorOptionDefList::TranslatorOptionDefList(S_Session session,
                                                  const string& model)
-    : TranslatorOptionDef(session, model) {
+    : TranslatorBasic(session), TranslatorOptionDef(session, model),
+      model_(model) {
 }
 
 TranslatorOptionDefList::~TranslatorOptionDefList() {
diff --git a/src/lib/yang/translator_option_def.h b/src/lib/yang/translator_option_def.h
index 2110c2ef13..31027bdaff 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 : public TranslatorBasic {
+class TranslatorOptionDef : virtual public TranslatorBasic {
 public:
 
     /// @brief Constructor.
@@ -169,6 +169,9 @@ 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