Changes to please GCC

- forgot that C++17 extensions aren’t everywhere yet
This commit is contained in:
Nikolaj Schlej 2016-04-08 13:48:13 +02:00
parent 1a6d2142b0
commit 1dddafd4b3

View file

@ -4173,7 +4173,7 @@ STATUS FfsParser::parseEvsaStoreBody(const QModelIndex & index)
QObject::tr("%1h, invalid, should be %2h").hexarg2(guidHeader->Header.Checksum, 2).hexarg2(calculated, 2)) QObject::tr("%1h, invalid, should be %2h").hexarg2(guidHeader->Header.Checksum, 2).hexarg2(calculated, 2))
.hexarg2(guidHeader->GuidId, 4); .hexarg2(guidHeader->GuidId, 4);
subtype = Subtypes::GuidEvsaEntry; subtype = Subtypes::GuidEvsaEntry;
guidMap.insert_or_assign(guidHeader->GuidId, guidHeader->Guid); guidMap.insert(std::pair<UINT16, EFI_GUID>(guidHeader->GuidId, guidHeader->Guid));
} }
// Name entry // Name entry
else if (entryHeader->Type == NVRAM_EVSA_ENTRY_TYPE_NAME1 || else if (entryHeader->Type == NVRAM_EVSA_ENTRY_TYPE_NAME1 ||
@ -4192,7 +4192,7 @@ STATUS FfsParser::parseEvsaStoreBody(const QModelIndex & index)
QObject::tr("%1h, invalid, should be %2h").hexarg2(nameHeader->Header.Checksum, 2).hexarg2(calculated, 2)) QObject::tr("%1h, invalid, should be %2h").hexarg2(nameHeader->Header.Checksum, 2).hexarg2(calculated, 2))
.hexarg2(nameHeader->VarId, 4); .hexarg2(nameHeader->VarId, 4);
subtype = Subtypes::NameEvsaEntry; subtype = Subtypes::NameEvsaEntry;
nameMap.insert_or_assign(nameHeader->VarId, name); nameMap.insert(std::pair<UINT16, QString>(nameHeader->VarId, name));
} }
// Data entry // Data entry
else if (entryHeader->Type == NVRAM_EVSA_ENTRY_TYPE_DATA1 || else if (entryHeader->Type == NVRAM_EVSA_ENTRY_TYPE_DATA1 ||