commit 4d8a9c21081923097d83135745d7c399019dcf07
author Václav Kubernát <kubernat@cesnet.cz> Tue May 26 23:56:10 2020 +0200
committer Václav Kubernát <kubernat@cesnet.cz> Tue May 26 23:56:10 2020 +0200
tree 9f6c5e30816cb93f1f5f928d1a7652cfcc758c73
parent 5b8a8f38d65ace63cb2f18d96dccf9e5264f1856

Prefer std::variant in StaticSchema

Change-Id: Ib9c048fd7175ce551f597e8af050388263fee847

src/static_schema.cpp

diff --git a/src/static_schema.cpp b/src/static_schema.cpp
index 7102e9c..716be65 100644
--- a/src/static_schema.cpp
+++ b/src/static_schema.cpp
@@ -49,7 +49,7 @@
     assert(isList(location, node));
 
     const auto& child = children(locationString).at(fullNodeName(location, node));
-    const auto& list = boost::get<yang::list>(child.m_nodeType);
+    const auto& list = std::get<yang::list>(child.m_nodeType);
     return list.m_keys.find(key) != list.m_keys.end();
 }
 
@@ -59,7 +59,7 @@
     assert(isList(location, node));
 
     const auto& child = children(locationString).at(fullNodeName(location, node));
-    const auto& list = boost::get<yang::list>(child.m_nodeType);
+    const auto& list = std::get<yang::list>(child.m_nodeType);
     return list.m_keys;
 }
 
@@ -128,12 +128,12 @@
 {
     std::string locationString = pathToSchemaString(location, Prefixes::Always);
     auto nodeType = children(locationString).at(fullNodeName(location, node)).m_nodeType;
-    if (nodeType.type() == typeid(yang::leaf)) {
-        return boost::get<yang::leaf>(nodeType).m_type;
+    if (std::holds_alternative<yang::leaf>(nodeType)) {
+        return std::get<yang::leaf>(nodeType).m_type;
     }
 
-    if (nodeType.type() == typeid(yang::leaflist)) {
-        return boost::get<yang::leaflist>(nodeType).m_type;
+    if (std::holds_alternative<yang::leaflist>(nodeType)) {
+        return std::get<yang::leaflist>(nodeType).m_type;
     }
 
     throw std::logic_error("StaticSchema::leafType: Path is not a leaf or a leaflist");
@@ -143,7 +143,7 @@
 {
     auto locationString = stripLastNodeFromPath(path);
     auto node = lastNodeOfSchemaPath(path);
-    return boost::get<yang::leaf>(children(locationString).at(node).m_nodeType).m_type;
+    return std::get<yang::leaf>(children(locationString).at(node).m_nodeType).m_type;
 }
 
 std::set<ModuleNodePair> StaticSchema::availableNodes(const boost::variant<dataPath_, schemaPath_, module_>& path, const Recursion recursion) const
@@ -201,22 +201,22 @@
     try {
         auto targetNode = children(locationString).at(fullName);
 
-        if (targetNode.m_nodeType.type() == typeid(yang::container)) {
-            if (boost::get<yang::container>(targetNode.m_nodeType).m_presence == yang::ContainerTraits::Presence) {
+        if (std::holds_alternative<yang::container>(targetNode.m_nodeType)) {
+            if (std::get<yang::container>(targetNode.m_nodeType).m_presence == yang::ContainerTraits::Presence) {
                 return yang::NodeTypes::PresenceContainer;
             }
             return yang::NodeTypes::Container;
         }
 
-        if (targetNode.m_nodeType.type() == typeid(yang::list)) {
+        if (std::holds_alternative<yang::list>(targetNode.m_nodeType)) {
             return yang::NodeTypes::List;
         }
 
-        if (targetNode.m_nodeType.type() == typeid(yang::leaf)) {
+        if (std::holds_alternative<yang::leaf>(targetNode.m_nodeType)) {
             return yang::NodeTypes::Leaf;
         }
 
-        if (targetNode.m_nodeType.type() == typeid(yang::leaflist)) {
+        if (std::holds_alternative<yang::leaflist>(targetNode.m_nodeType)) {
             return yang::NodeTypes::LeafList;
         }