From 88f936a9266e7d95b45d7145e07d73cfbeb7e618 Mon Sep 17 00:00:00 2001 From: Anatoly Serdtcev Date: Wed, 3 Apr 2019 18:47:16 +0300 Subject: [PATCH] [generator:regions] Fix for review --- generator/generator_tests/regions_tests.cpp | 2 +- generator/place_node.hpp | 4 ++-- generator/regions/regions.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generator/generator_tests/regions_tests.cpp b/generator/generator_tests/regions_tests.cpp index f875436684..e1a3cca236 100644 --- a/generator/generator_tests/regions_tests.cpp +++ b/generator/generator_tests/regions_tests.cpp @@ -199,7 +199,7 @@ UNIT_TEST(RegionsBuilderTest_GetCountryTrees) RegionsBuilder builder(MakeTestDataSet1(collector)); builder.ForEachNormalizedCountry([&](std::string const & name, Node::Ptr const & tree) { Visit(tree, [&](Node::Ptr const & node) { - auto path = MakeNodePath(node); + auto const path = MakeNodePath(node); StringJoinPolicy stringifier; bankOfNames.push_back(stringifier.ToString(path)); }); diff --git a/generator/place_node.hpp b/generator/place_node.hpp index 5f4bfb97c0..e3f6a101c6 100644 --- a/generator/place_node.hpp +++ b/generator/place_node.hpp @@ -47,8 +47,8 @@ private: template void Visit(std::shared_ptr> const & tree, Visitor && visitor) { - std::forward(visitor)(tree); + visitor(tree); for (auto const & subtree : tree->GetChildren()) - Visit(subtree, std::forward(visitor)); + Visit(subtree, visitor); } } // namespace generator diff --git a/generator/regions/regions.cpp b/generator/regions/regions.cpp index fa7cea1182..8595b1afc0 100644 --- a/generator/regions/regions.cpp +++ b/generator/regions/regions.cpp @@ -80,8 +80,8 @@ private: auto jsonPolicy = JsonPolicy{m_verbose}; Visit(tree, [&](auto && node) { - auto id = node->GetData().GetId(); - auto path = MakeNodePath(node); + auto const id = node->GetData().GetId(); + auto const path = MakeNodePath(node); regionsKv << static_cast(id.GetEncodedId()) << " " << jsonPolicy.ToString(path) << "\n"; ++countIds; if (!setIds.insert(id).second)