From 631c0a59c42108a79a4e3bb4108f39f46e5312eb Mon Sep 17 00:00:00 2001 From: artemp Date: Thu, 6 Jul 2017 11:14:24 +0200 Subject: [PATCH] Revert "trying to `inline` lambdas (VS2017) (!)" this is not allowed in c++14 requires c++17 This reverts commit 0ad1c580094c9ecbe95ea71c1c5bb8c735d853a6. --- include/mapnik/json/generic_json_grammar_x3.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mapnik/json/generic_json_grammar_x3.hpp b/include/mapnik/json/generic_json_grammar_x3.hpp index 2da057596..27cd92c44 100644 --- a/include/mapnik/json/generic_json_grammar_x3.hpp +++ b/include/mapnik/json/generic_json_grammar_x3.hpp @@ -43,17 +43,17 @@ BOOST_SPIRIT_DECLARE(generic_json_grammar_type); BOOST_SPIRIT_DECLARE(generic_json_key_value_type); } -inline auto assign = [](auto const& ctx) +auto assign = [](auto const& ctx) { _val(ctx) = _attr(ctx); }; -inline auto assign_key = [](auto const& ctx) +auto assign_key = [](auto const& ctx) { - std::get<0>(_val(ctx)) = std::move(_attr(ctx)); + std::get<0>(_val(ctx)) = _attr(ctx); }; -inline auto assign_value = [](auto const& ctx) +auto assign_value = [](auto const& ctx) { std::get<1>(_val(ctx)) = std::move(_attr(ctx)); };