From f76b9db0008cba5a576fcd04a94946e4ffc5415b Mon Sep 17 00:00:00 2001 From: Lukasz Bardeli Date: Thu, 26 Feb 2015 12:44:19 +0100 Subject: [PATCH] [NFC] build error fixed for 3.0 Change-Id: I3fe456e58bc4b2c9c1e4e1ed6555e300d7d0bff8 Signed-off-by: Lukasz Bardeli --- src/nfc/nfc_adapter.cc | 42 ++++++++++++++++++------------------ src/nfc/nfc_message_utils.cc | 24 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc index 09989f17..52521aea 100644 --- a/src/nfc/nfc_adapter.cc +++ b/src/nfc/nfc_adapter.cc @@ -75,7 +75,7 @@ static picojson::value CreateEventError(double callbackId, const PlatformResult& picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); tools::ReportError(ret, &obj); - obj.insert(std::make_pair(CALLBACK_ID, callbackId)); + obj.insert(std::make_pair(CALLBACK_ID, picojson::value(callbackId))); return event; } @@ -86,7 +86,7 @@ static picojson::value createEventError(double callbackId, PlatformException ex) picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); tools::ReportError(ex, obj); - obj.insert(std::make_pair(CALLBACK_ID, callbackId)); + obj.insert(std::make_pair(CALLBACK_ID, picojson::value(callbackId))); return event; } @@ -95,7 +95,7 @@ static picojson::value createEventSuccess(double callbackId) { picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); tools::ReportSuccess(obj); - obj.insert(std::make_pair(CALLBACK_ID, callbackId)); + obj.insert(std::make_pair(CALLBACK_ID, picojson::value(callbackId))); return event; } @@ -116,7 +116,7 @@ static void targetDetectedCallback(nfc_discovered_type_e type, picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); - obj.insert(make_pair("listenerId", "PeerListener")); + obj.insert(make_pair("listenerId", picojson::value("PeerListener"))); NFCAdapter* adapter = NFCAdapter::GetInstance(); @@ -127,13 +127,13 @@ static void targetDetectedCallback(nfc_discovered_type_e type, if (NFC_DISCOVERED_TYPE_ATTACHED == type) { adapter->SetPeerHandle(target); - obj.insert(make_pair("action", "onattach")); + obj.insert(make_pair("action", picojson::value("onattach"))); adapter->IncreasePeerId(); - obj.insert(make_pair("id", static_cast(adapter->GetPeerId()))); + obj.insert(make_pair("id", picojson::value(static_cast(adapter->GetPeerId())))); NFCInstance::getInstance().PostMessage(event.serialize().c_str()); } else { adapter->SetPeerHandle(NULL); - obj.insert(make_pair("action", "ondetach")); + obj.insert(make_pair("action", picojson::value("ondetach"))); NFCInstance::getInstance().PostMessage(event.serialize().c_str()); } } @@ -181,19 +181,19 @@ static void se_event_callback(nfc_se_event_e se_event, void *user_data) { switch (se_event) { case NFC_SE_EVENT_SE_TYPE_CHANGED: NFCAdapter::GetInstance()->GetActiveSecureElement(&result); - obj.insert(make_pair(LISTENER_ID, ACTIVE_SECURE_ELEMENT_CHANGED)); + obj.insert(make_pair(LISTENER_ID, picojson::value(ACTIVE_SECURE_ELEMENT_CHANGED))); break; case NFC_SE_EVENT_CARD_EMULATION_CHANGED: NFCAdapter::GetInstance()->GetCardEmulationMode(&result); - obj.insert(make_pair(LISTENER_ID, CARD_EMULATION_MODE_CHANGED)); + obj.insert(make_pair(LISTENER_ID, picojson::value(CARD_EMULATION_MODE_CHANGED))); break; default: LOGD("se_event_occured: %d", se_event); return; } - obj.insert(make_pair(TYPE, CARD_ELEMENT)); - obj.insert(make_pair(MODE, result)); + obj.insert(make_pair(TYPE, picojson::value(CARD_ELEMENT))); + obj.insert(make_pair(MODE, picojson::value(result))); NFCInstance::getInstance().PostMessage(event.serialize().c_str()); } @@ -221,12 +221,12 @@ static void transaction_event_callback(nfc_se_type_e type, } if (NFC_SE_TYPE_ESE == type) { - response_obj.insert(make_pair(LISTENER_ID, TRANSACTION_EVENT_LISTENER_ESE)); + response_obj.insert(make_pair(LISTENER_ID, picojson::value(TRANSACTION_EVENT_LISTENER_ESE))); } else { - response_obj.insert(make_pair(LISTENER_ID, TRANSACTION_EVENT_LISTENER_UICC)); + response_obj.insert(make_pair(LISTENER_ID, picojson::value(TRANSACTION_EVENT_LISTENER_UICC))); } - response_obj.insert(make_pair(TYPE, TRANSACTION)); + response_obj.insert(make_pair(TYPE, picojson::value(TRANSACTION))); NFCInstance::getInstance().PostMessage(response.serialize().c_str()); } @@ -652,8 +652,8 @@ static void targetReceivedCallback(nfc_p2p_target_h target, nfc_ndef_message_h m picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); - obj.insert(make_pair("listenerId", "ReceiveNDEFListener")); - obj.insert(make_pair("id", static_cast(NFCAdapter::GetInstance()->GetPeerId()))); + obj.insert(make_pair("listenerId", picojson::value("ReceiveNDEFListener"))); + obj.insert(make_pair("id", picojson::value(static_cast(NFCAdapter::GetInstance()->GetPeerId())))); NFCMessageUtils::ReportNdefMessageFromData(raw_data, size, obj); @@ -874,7 +874,7 @@ static void tagEventCallback(nfc_discovered_type_e type, nfc_tag_h tag, void *da picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); - obj.insert(make_pair("listenerId", "TagListener")); + obj.insert(make_pair("listenerId", picojson::value("TagListener"))); NFCAdapter* adapter = NFCAdapter::GetInstance(); // Tag detected event @@ -891,9 +891,9 @@ static void tagEventCallback(nfc_discovered_type_e type, nfc_tag_h tag, void *da int generated_id = adapter->GetNextTagId(); adapter->SetTagHandle(tag); - obj.insert(make_pair("action", "onattach")); - obj.insert(make_pair("id", static_cast(generated_id))); - obj.insert(make_pair("type", NFCUtil::ToStringNFCTag(tag_type))); + obj.insert(make_pair("action", picojson::value("onattach"))); + obj.insert(make_pair("id", picojson::value(static_cast(generated_id)))); + obj.insert(make_pair("type", picojson::value(NFCUtil::ToStringNFCTag(tag_type)))); NFCInstance::getInstance().PostMessage(event.serialize().c_str()); } @@ -902,7 +902,7 @@ static void tagEventCallback(nfc_discovered_type_e type, nfc_tag_h tag, void *da // Set stored tag handle to NULL adapter->SetTagHandle(NULL); - obj.insert(make_pair("action", "ondetach")); + obj.insert(make_pair("action", picojson::value("ondetach"))); NFCInstance::getInstance().PostMessage(event.serialize().c_str()); } // ERROR - should never happen diff --git a/src/nfc/nfc_message_utils.cc b/src/nfc/nfc_message_utils.cc index 57577c3a..88e1d395 100644 --- a/src/nfc/nfc_message_utils.cc +++ b/src/nfc/nfc_message_utils.cc @@ -239,7 +239,7 @@ void NFCMessageUtils::ReportNdefMessageFromData(unsigned char* data, unsigned lo picojson::value records_array = picojson::value(picojson::array()); picojson::array& records_array_obj = records_array.get(); ToNdefRecords(message, records_array_obj); - out.insert(std::make_pair("records", records_array)); + out.insert(std::make_pair("records", picojson::value(records_array))); RemoveMessageHandle(message); } @@ -365,7 +365,7 @@ void NFCMessageUtils::NDEFMessageToByte(const picojson::value& args, picojson::o nfc_ndef_message_h message = NDEFMessageToStruct(records_array, size); if (!message) { - out.insert(std::make_pair("bytes", byte_array)); + out.insert(std::make_pair("bytes", picojson::value(byte_array))); return; } @@ -389,7 +389,7 @@ void NFCMessageUtils::NDEFMessageToByte(const picojson::value& args, picojson::o if (raw_data) { free(raw_data); } - out.insert(std::make_pair("bytes", byte_array)); + out.insert(std::make_pair("bytes", picojson::value(byte_array))); } /* -------------------------------RECORD FUNCTIONS------------------------------------ */ @@ -397,28 +397,28 @@ static void ConstructRecordJson(short _tnf, const UCharVector& _type_name, const UCharVector& _id, const UCharVector& _payload, picojson::object& out) { LoggerD("Entered"); - out.insert(std::make_pair("tnf", std::to_string(_tnf))); + out.insert(std::make_pair("tnf", picojson::value(std::to_string(_tnf)))); picojson::value type_array = picojson::value(picojson::array()); picojson::array& type_array_obj = type_array.get(); for (size_t i = 0 ; i < _type_name.size(); i++) { type_array_obj.push_back(picojson::value(std::to_string(_type_name[i]))); } - out.insert(std::make_pair("type", type_array)); + out.insert(std::make_pair("type", picojson::value(type_array))); picojson::value id_array = picojson::value(picojson::array()); picojson::array& id_array_obj = id_array.get(); for (size_t i = 0 ; i < _id.size(); i++) { id_array_obj.push_back(picojson::value(std::to_string(_id[i]))); } - out.insert(std::make_pair("id", id_array)); + out.insert(std::make_pair("id", picojson::value(id_array))); picojson::value payload_array = picojson::value(picojson::array()); picojson::array& payload_array_obj = payload_array.get(); for (size_t i = 0 ; i < _payload.size(); i++) { payload_array_obj.push_back(picojson::value(std::to_string(_payload[i]))); } - out.insert(std::make_pair("payload", payload_array)); + out.insert(std::make_pair("payload", picojson::value(payload_array))); } void NFCMessageUtils::ConstructNdefRecordFromRecordHandle(nfc_ndef_record_h record_handle, @@ -580,9 +580,9 @@ void NFCMessageUtils::ReportNdefRecordTextFromMessage(nfc_ndef_message_h message std::string encoding_str = convertEncodingToString(encoding); ReportNDEFRecordTextFromText(text, language_code, encoding_str, out); - out.insert(std::make_pair("text", text)); - out.insert(std::make_pair("languageCode", language_code)); - out.insert(std::make_pair("encoding", encoding_str)); + out.insert(std::make_pair("text", picojson::value(text))); + out.insert(std::make_pair("languageCode", picojson::value(language_code))); + out.insert(std::make_pair("encoding", picojson::value(encoding_str))); } void NFCMessageUtils::ReportNDEFRecordText(const picojson::value& args, picojson::object& out){ @@ -650,7 +650,7 @@ void NFCMessageUtils::ReportNdefRecordURIFromMessage(nfc_ndef_message_h message_ std::string uri = getURIFromHandle(record_handle, message_handle); ReportNDEFRecordURIFromURI(uri, out); - out.insert(std::make_pair("uri", uri)); + out.insert(std::make_pair("uri", picojson::value(uri))); } void NFCMessageUtils::ReportNDEFRecordURI(const picojson::value& args, picojson::object& out){ @@ -699,7 +699,7 @@ void NFCMessageUtils::ReportNdefRecordMediaFromMessage(nfc_ndef_message_h messag UCharVector _payload = getPayloadFromHandle(record_handle, message_handle); //constructing json ConstructRecordJson(_tnf, _type_name, _id, _payload, out); - out.insert(std::make_pair("mimeType", mime_type)); + out.insert(std::make_pair("mimeType", picojson::value(mime_type))); } void NFCMessageUtils::ReportNDEFRecordMedia(const picojson::value& args, picojson::object& out){ -- 2.34.1