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 bcfd5795d472fd2098343b641c02be0805987ce7..bf878d75f8c4fd76ac1621c20ee74b923ff451fc 100644 (file)
--- 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<picojson::object>();
     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 f5dc512ff6956adc9e6df5509141e818779f91af..ea8ca52cb38113dfc99db874b020d5c8cc286bb6 100644 (file)
--- 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<picojson::object>();
 
-    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 f78145a2c34e06d35e64992b726657363df6c379..fba2446370df6eda10cb283caba7d96c4d49c788 100644 (file)
--- 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<JsonValue>& response) -> void {
     picojson::object& obj = response->get<picojson::object>();
-    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<JsonValue>& response) -> void {
     picojson::object& obj = response->get<picojson::object>();
-    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<JsonValue>& response) -> void {
     picojson::object& obj = response->get<picojson::object>();
-    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<JsonValue>& response) -> void {
     picojson::object& obj = response->get<picojson::object>();
-    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<JsonValue> &
                                             response)->void {
     picojson::object& obj = response->get<picojson::object>();
-    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());
   };