LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "header-checker: Remove C++ 17 usages"

Browse Source
This commit is contained in:
Logan Chien
2019-12-17 05:52:02 +00:00
committed by Gerrit Code Review
parent 384d61d947 877c9a1457
commit 5ff740f0ed
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vndk/tools/header-checker/src/repr/ir_reader.cpp
View File

@@ -67,9 +67,8 @@ MergeStatus IRReader::MergeBuiltinType(
// Add this builtin type to the parent graph's builtin_types_ map. // Add this builtin type to the parent graph's builtin_types_ map.
const std::string &type_id = builtin_type->GetSelfType(); const std::string &type_id = builtin_type->GetSelfType();
auto [it, inserted] = module_->builtin_types_.emplace( auto p = module_->builtin_types_.emplace(linker_set_key, *builtin_type);
linker_set_key, *builtin_type); module_->type_graph_.emplace(type_id, &p.first->second);
module_->type_graph_.emplace(type_id, &it->second);
MergeStatus merge_status(true, type_id); MergeStatus merge_status(true, type_id);
local_to_global_type_id_map->emplace(type_id, merge_status); local_to_global_type_id_map->emplace(type_id, merge_status);
@@ -262,11 +261,12 @@ IRReader::UpdateUDTypeAccounting(
MergeStatus IRReader::MergeRecordAndDependencies( MergeStatus IRReader::MergeRecordAndDependencies(
const RecordTypeIR *addend_node, const IRReader &addend, const RecordTypeIR *addend_node, const IRReader &addend,
AbiElementMap<MergeStatus> *local_to_global_type_id_map) { AbiElementMap<MergeStatus> *local_to_global_type_id_map) {
auto [merge_status, it] = UpdateUDTypeAccounting( auto p = UpdateUDTypeAccounting(
addend_node, addend, local_to_global_type_id_map, addend_node, addend, local_to_global_type_id_map,
&module_->record_types_); &module_->record_types_);
MergeRecordDependencies(addend, &it->second, local_to_global_type_id_map); MergeRecordDependencies(addend, &p.second->second,
return merge_status; local_to_global_type_id_map);
return p.first;
} }
@@ -293,21 +293,22 @@ void IRReader::MergeEnumDependencies(
MergeStatus IRReader::MergeEnumType( MergeStatus IRReader::MergeEnumType(
const EnumTypeIR *addend_node, const IRReader &addend, const EnumTypeIR *addend_node, const IRReader &addend,
AbiElementMap<MergeStatus> *local_to_global_type_id_map) { AbiElementMap<MergeStatus> *local_to_global_type_id_map) {
auto [merge_status, it] = UpdateUDTypeAccounting( auto p = UpdateUDTypeAccounting(
addend_node, addend, local_to_global_type_id_map, &module_->enum_types_); addend_node, addend, local_to_global_type_id_map, &module_->enum_types_);
MergeEnumDependencies(addend, &it->second, local_to_global_type_id_map); MergeEnumDependencies(addend, &p.second->second, local_to_global_type_id_map);
return merge_status; return p.first;
} }
MergeStatus IRReader::MergeFunctionType( MergeStatus IRReader::MergeFunctionType(
const FunctionTypeIR *addend_node, const IRReader &addend, const FunctionTypeIR *addend_node, const IRReader &addend,
AbiElementMap<MergeStatus> *local_to_global_type_id_map) { AbiElementMap<MergeStatus> *local_to_global_type_id_map) {
auto [merge_status, it] = UpdateUDTypeAccounting( auto p = UpdateUDTypeAccounting(
addend_node, addend, local_to_global_type_id_map, addend_node, addend, local_to_global_type_id_map,
&module_->function_types_); &module_->function_types_);
MergeCFunctionLikeDeps(addend, &it->second, local_to_global_type_id_map); MergeCFunctionLikeDeps(addend, &p.second->second,
return merge_status; local_to_global_type_id_map);
return p.first;
} }