Author: sberg Date: Mon May 29 03:51:58 2017 New Revision: 304142 URL: http://llvm.org/viewvc/llvm-project?rev=304142&view=rev Log: More StructuredData::Type::eTypeDictionary -> lldb::eStructuredDataTypeDictionary
...missing from previous r304138 "Added new API to SBStructuredData class" Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp?rev=304142&r1=304141&r2=304142&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp (original) +++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp Mon May 29 03:51:58 2017 @@ -3278,7 +3278,7 @@ GDBRemoteCommunicationClient::SendGetTra auto json_object = StructuredData::ParseJSON(response.Peek()); if (!json_object || - json_object->GetType() != StructuredData::Type::eTypeDictionary) { + json_object->GetType() != lldb::eStructuredDataTypeDictionary) { error.SetErrorString("Invalid Configuration obtained"); return error; } @@ -3299,7 +3299,7 @@ GDBRemoteCommunicationClient::SendGetTra json_dict->GetValueForKey("params"); if (custom_params_sp) { if (custom_params_sp->GetType() != - StructuredData::Type::eTypeDictionary) { + lldb::eStructuredDataTypeDictionary) { error.SetErrorString("Invalid Configuration obtained"); return error; } else Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp?rev=304142&r1=304141&r2=304142&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp (original) +++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp Mon May 29 03:51:58 2017 @@ -1120,7 +1120,7 @@ GDBRemoteCommunicationServerLLGS::Handle auto json_object = StructuredData::ParseJSON(packet.Peek()); if (!json_object || - json_object->GetType() != StructuredData::Type::eTypeDictionary) + json_object->GetType() != lldb::eStructuredDataTypeDictionary) return SendIllFormedResponse(packet, "jTraceStart: Ill formed packet "); auto json_dict = json_object->GetAsDictionary(); @@ -1140,7 +1140,7 @@ GDBRemoteCommunicationServerLLGS::Handle StructuredData::ObjectSP custom_params_sp = json_dict->GetValueForKey("params"); if (custom_params_sp && - custom_params_sp->GetType() != StructuredData::Type::eTypeDictionary) + custom_params_sp->GetType() != lldb::eStructuredDataTypeDictionary) return SendIllFormedResponse(packet, "jTraceStart: Ill formed packet "); options.setTraceParams( @@ -1182,7 +1182,7 @@ GDBRemoteCommunicationServerLLGS::Handle auto json_object = StructuredData::ParseJSON(packet.Peek()); if (!json_object || - json_object->GetType() != StructuredData::Type::eTypeDictionary) + json_object->GetType() != lldb::eStructuredDataTypeDictionary) return SendIllFormedResponse(packet, "jTraceStop: Ill formed packet "); auto json_dict = json_object->GetAsDictionary(); @@ -1219,7 +1219,7 @@ GDBRemoteCommunicationServerLLGS::Handle auto json_object = StructuredData::ParseJSON(packet.Peek()); if (!json_object || - json_object->GetType() != StructuredData::Type::eTypeDictionary) + json_object->GetType() != lldb::eStructuredDataTypeDictionary) return SendIllFormedResponse(packet, "jTraceConfigRead: Ill formed packet "); @@ -1287,7 +1287,7 @@ GDBRemoteCommunicationServerLLGS::Handle auto json_object = StructuredData::ParseJSON(packet.Peek()); if (!json_object || - json_object->GetType() != StructuredData::Type::eTypeDictionary) + json_object->GetType() != lldb::eStructuredDataTypeDictionary) return SendIllFormedResponse(packet, "jTrace: Ill formed packet "); auto json_dict = json_object->GetAsDictionary(); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits