commit 76e983c80646083b638f8c8640a755a64a6595bb
author Václav Kubernát <kubervac@fit.cvut.cz> Mon Aug 06 13:56:03 2018 +0200
committer Václav Kubernát <kubervac@fit.cvut.cz> Mon Aug 06 14:00:31 2018 +0200
tree 290994489b15e015fb06b3a33ff3faa52779b827
parent bb79f0f254c26b328fb0aafaab5a05c93d7b3a12

Change return value of listKeys

Not every subclass stores keys in a set, so returning a reference might
not always be possible.

Change-Id: If19f81d9ee9ddb5e2ce0133af1a39115f62676a3

src/schema.hpp

diff --git a/src/schema.hpp b/src/schema.hpp
index 2059e1b..96176ab 100644
--- a/src/schema.hpp
+++ b/src/schema.hpp
@@ -73,7 +73,7 @@
     virtual bool leafEnumHasValue(const path_& location, const ModuleNodePair& node, const std::string& value) const = 0;
     virtual bool listHasKey(const path_& location, const ModuleNodePair& node, const std::string& key) const = 0;
     virtual bool nodeExists(const std::string& location, const std::string& node) const = 0;
-    virtual const std::set<std::string>& listKeys(const path_& location, const ModuleNodePair& node) const = 0;
+    virtual const std::set<std::string> listKeys(const path_& location, const ModuleNodePair& node) const = 0;
     virtual yang::LeafDataTypes leafType(const path_& location, const ModuleNodePair& node) const = 0;
     virtual std::set<std::string> childNodes(const path_& path) const = 0;
 

src/static_schema.cpp

diff --git a/src/static_schema.cpp b/src/static_schema.cpp
index 86dc6fa..1778c68 100644
--- a/src/static_schema.cpp
+++ b/src/static_schema.cpp
@@ -66,7 +66,7 @@
     return list.m_keys.find(key) != list.m_keys.end();
 }
 
-const std::set<std::string>& StaticSchema::listKeys(const path_& location, const ModuleNodePair& node) const
+const std::set<std::string> StaticSchema::listKeys(const path_& location, const ModuleNodePair& node) const
 {
     std::string locationString = pathToAbsoluteSchemaString(location);
     assert(isList(location, node));

src/static_schema.hpp

diff --git a/src/static_schema.hpp b/src/static_schema.hpp
index 1a84e23..72e23d9 100644
--- a/src/static_schema.hpp
+++ b/src/static_schema.hpp
@@ -33,7 +33,7 @@
     bool leafEnumHasValue(const path_& location, const ModuleNodePair& node, const std::string& value) const override;
     bool listHasKey(const path_& location, const ModuleNodePair& node, const std::string& key) const override;
     bool nodeExists(const std::string& location, const std::string& node) const override;
-    const std::set<std::string>& listKeys(const path_& location, const ModuleNodePair& node) const override;
+    const std::set<std::string> listKeys(const path_& location, const ModuleNodePair& node) const override;
     yang::LeafDataTypes leafType(const path_& location, const ModuleNodePair& node) const override;
     std::set<std::string> childNodes(const path_& path) const override;