From 90841915df406fc394cb5d5a7d4fe4554be798c1 Mon Sep 17 00:00:00 2001 From: Mariusz Polasinski Date: Tue, 27 Jan 2015 08:43:45 +0100 Subject: [PATCH] [Websetting] Explicit call picosjon::value constructor [Problem] On TV I can't call 'std::map, picojson::value>::insert(std::pair) I must use explicit conversion. This error occurs probably because there is different version of gcc for mobile and TV [Solution] I used explicit picosjon::value constructor [Verification] Code complies without errors Signed-off-by: Mariusz Polasinski Change-Id: I06aaf19636839e0d851f0ba05a0ae6b4a254b357 --- src/websetting/websetting_instance.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/websetting/websetting_instance.cc b/src/websetting/websetting_instance.cc index ff9caee..c2ffc6f 100644 --- a/src/websetting/websetting_instance.cc +++ b/src/websetting/websetting_instance.cc @@ -63,7 +63,7 @@ void WebSettingInstance::setUserAgentString(const picojson::value& args, auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { picojson::object& obj = response->get(); - obj.insert(std::make_pair("callbackId", callback_id)); + obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); LoggerD("callback is %s", response->serialize().c_str()); PostMessage(response->serialize().c_str()); }; @@ -96,7 +96,7 @@ void WebSettingInstance::removeAllCookies(const picojson::value& args, auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { picojson::object& obj = response->get(); - obj.insert(std::make_pair("callbackId", callback_id)); + obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); LoggerD("callback is %s", response->serialize().c_str()); PostMessage(response->serialize().c_str()); }; -- 2.7.4