commit 1ff19276b375a8e2b7066d2ee4fd0bd473902a8e
author Jae Hyun Yoo <jae.hyun.yoo@intel.com> Thu Oct 18 10:58:26 2018 -0700
committer James Feist <james.feist@linux.intel.com> Thu Oct 18 13:52:43 2018 -0700
tree 60b9d90016bf3ede51c54d55aa21456fef93dcab
parent a046044b7ed2389fa866c84096cbf4dc270511fd

Replace apply_visitor() calls with visit()

This commit replaces apply_visitor() calls with
std::variant std::visit() interface which is added by William.

Change-Id: Ic8bf903571998489ec51d2c6cbfe0a8ba9483d03
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>

src/EntityManager.cpp

diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 6210f46..29631fb 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -25,7 +25,6 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/variant/apply_visitor.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
@@ -238,7 +237,7 @@
                         std::smatch match;
 
                         // convert value to string respresentation
-                        std::string probeValue = variant_ns::apply_visitor(
+                        std::string probeValue = variant_ns::visit(
                             VariantToStringVisitor(), deviceValue->second);
                         if (!std::regex_search(probeValue, match, search))
                         {
@@ -250,7 +249,7 @@
                     case nlohmann::json::value_t::boolean:
                     case nlohmann::json::value_t::number_unsigned:
                     {
-                        unsigned int probeValue = variant_ns::apply_visitor(
+                        unsigned int probeValue = variant_ns::visit(
                             VariantToUnsignedIntVisitor(), deviceValue->second);
 
                         if (probeValue != match.second.get<unsigned int>())
@@ -261,7 +260,7 @@
                     }
                     case nlohmann::json::value_t::number_integer:
                     {
-                        int probeValue = variant_ns::apply_visitor(
+                        int probeValue = variant_ns::visit(
                             VariantToIntVisitor(), deviceValue->second);
 
                         if (probeValue != match.second.get<int>())
@@ -272,7 +271,7 @@
                     }
                     case nlohmann::json::value_t::number_float:
                     {
-                        float probeValue = variant_ns::apply_visitor(
+                        float probeValue = variant_ns::visit(
                             VariantToFloatVisitor(), deviceValue->second);
 
                         if (probeValue != match.second.get<float>())
@@ -798,7 +797,7 @@
             for (const auto &item : data)
             {
                 nlohmann::json &newJson = newData[item.first];
-                variant_ns::apply_visitor(
+                variant_ns::visit(
                     [&newJson](auto &&val) { newJson = std::move(val); },
                     item.second);
             }
@@ -1103,7 +1102,7 @@
             {
                 if (boost::iequals(foundDevicePair.first, templateValue))
                 {
-                    variant_ns::apply_visitor(
+                    variant_ns::visit(
                         [&](auto &&val) { keyPair.value() = val; },
                         foundDevicePair.second);
                     found = true;