[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 d4dd3010d09929e796d689bdd9ff4e859bc04c20..47e279cd05ada34274b6f84036dc9fcc8908eb56 100644 (file)
--- 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 2110c2ef137c159040c77734f60685203c831bdc..31027bdaff8fc4c8b3ef6d7eaac44d653e48b75f 100644 (file)
--- 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