From: Hyunjin Park Date: Wed, 25 Mar 2015 08:20:42 +0000 (+0900) Subject: build error fix2 - STL_MAP issue from gcc 4.9 X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~245^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=304649fb45af5ae986b960fc59db3743f5932460;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git build error fix2 - STL_MAP issue from gcc 4.9 Change-Id: Id81dbea1019798f6227c17d4dfa71a09f855ddb6 --- diff --git a/src/badge/badge_manager.cc b/src/badge/badge_manager.cc index bcfd5795..bf878d75 100644 --- a/src/badge/badge_manager.cc +++ b/src/badge/badge_manager.cc @@ -199,8 +199,8 @@ void BadgeManager::badge_changed_cb(unsigned int action, const char *pkgname, picojson::object &response_obj = response.get(); response_obj.insert( std::make_pair("listenerId", std::string("BadgeChangeListener"))); - response_obj.insert(std::make_pair("appId", pkgname)); - response_obj.insert(std::make_pair("count", std::to_string(count))); + response_obj.insert(std::make_pair("appId", picojson::value(pkgname))); + response_obj.insert(std::make_pair("count", picojson::value(std::to_string(count)))); BadgeInstance::GetInstance().PostMessage(response.serialize().c_str()); } } diff --git a/src/calendar/calendar.cc b/src/calendar/calendar.cc index f5dc512f..ea8ca52c 100644 --- a/src/calendar/calendar.cc +++ b/src/calendar/calendar.cc @@ -218,7 +218,7 @@ PlatformResult Calendar::AddBatch(const picojson::object& args, picojson::value id = picojson::value(picojson::object()); picojson::object& id_obj = id.get(); - id_obj.insert(std::make_pair("uid", std::to_string(ids[i]))); + id_obj.insert(std::make_pair("uid", picojson::value(std::to_string(ids[i])))); if (type == CALENDAR_BOOK_TYPE_EVENT) { id_obj.insert(std::make_pair("rid", picojson::value())); diff --git a/src/calendar/calendar_instance.cc b/src/calendar/calendar_instance.cc index f78145a2..fba24463 100644 --- a/src/calendar/calendar_instance.cc +++ b/src/calendar/calendar_instance.cc @@ -102,7 +102,7 @@ void CalendarInstance::CalendarAddBatch(const JsonValue& 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()); }; @@ -141,7 +141,7 @@ void CalendarInstance::CalendarUpdateBatch(const JsonValue& 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()); }; @@ -180,7 +180,7 @@ void CalendarInstance::CalendarRemoveBatch(const JsonValue& 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()); }; @@ -206,7 +206,7 @@ void CalendarInstance::CalendarFind(const JsonValue& args, JsonObject& out) { 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 isssssss %s", response->serialize().c_str()); PostMessage(response->serialize().c_str()); }; @@ -285,7 +285,7 @@ void CalendarInstance::CalendarManagerGetCalendars(const JsonValue& 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()); };