Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-29 11:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix MSVC compile

Browse Source
This commit is contained in:
Jacob Dufault 2018-01-18 00:09:13 -08:00
parent e38c6103ea
commit 39b9991c8f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/messages/cquery_member_hierarchy.cc
View File

@ -17,8 +17,9 @@ struct Ipc_CqueryMemberHierarchyExpand
const static IpcId kIpcId = IpcId::CqueryMemberHierarchyExpand; const static IpcId kIpcId = IpcId::CqueryMemberHierarchyExpand;
lsRequestId id; lsRequestId id;
struct Params { struct Params {
size_t type_id; uint64_t type_id;
} params; };
Params params;
}; };
MAKE_REFLECT_STRUCT(Ipc_CqueryMemberHierarchyExpand::Params, type_id); MAKE_REFLECT_STRUCT(Ipc_CqueryMemberHierarchyExpand::Params, type_id);
MAKE_REFLECT_STRUCT(Ipc_CqueryMemberHierarchyExpand, id, params); MAKE_REFLECT_STRUCT(Ipc_CqueryMemberHierarchyExpand, id, params);
@ -28,7 +29,7 @@ struct Out_CqueryMemberHierarchy
: public lsOutMessage<Out_CqueryMemberHierarchy> { : public lsOutMessage<Out_CqueryMemberHierarchy> {
struct Entry { struct Entry {
std::string name; std::string name;
uint64_t type_id; uint64_t type_id; // FIXME: should be size_t
lsLocation location; lsLocation location;
}; };
lsRequestId id; lsRequestId id;
@ -73,7 +74,7 @@ ExpandNode(QueryDatabase* db,
Out_CqueryMemberHierarchy::Entry entry; Out_CqueryMemberHierarchy::Entry entry;
entry.name = var.def->short_name; entry.name = var.def->short_name;
entry.type_id = entry.type_id =
var.def->variable_type ? var.def->variable_type->id : size_t(-1); var.def->variable_type ? var.def->variable_type->id : uint64_t(-1);
if (var.def->definition_spelling) { if (var.def->definition_spelling) {
optional<lsLocation> loc = optional<lsLocation> loc =
GetLsLocation(db, working_files, *var.def->definition_spelling); GetLsLocation(db, working_files, *var.def->definition_spelling);
@ -124,7 +125,7 @@ struct CqueryMemberHierarchyExpandHandler
Out_CqueryMemberHierarchy out; Out_CqueryMemberHierarchy out;
out.id = request->id; out.id = request->id;
// |ExpandNode| uses -1 to indicate invalid |type_id|. // |ExpandNode| uses -1 to indicate invalid |type_id|.
if (request->params.type_id != size_t(-1)) if (request->params.type_id != uint64_t(-1))
out.result = out.result =
ExpandNode(db, working_files, QueryTypeId(request->params.type_id)); ExpandNode(db, working_files, QueryTypeId(request->params.type_id));