yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #6228 from lioncash/semi 

lm: Resolve -Wextra-semi warning
This commit is contained in:
bunnei 2021-04-23 19:59:20 -07:00 committed by GitHub
parent 2e268abe42 29cd40bded
commit 4cc8ab8a86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/hle/service/lm/lm.cpp
View File

@ -46,7 +46,7 @@ struct hash<Service::LM::LogPacketHeaderEntry> {
boost::hash_combine(seed, k.severity); boost::hash_combine(seed, k.severity);
boost::hash_combine(seed, k.verbosity); boost::hash_combine(seed, k.verbosity);
return seed; return seed;
}; }
}; };
} // namespace std } // namespace std
@ -95,7 +95,7 @@ private:
std::memcpy(&header, data.data(), sizeof(LogPacketHeader)); std::memcpy(&header, data.data(), sizeof(LogPacketHeader));
offset += sizeof(LogPacketHeader); offset += sizeof(LogPacketHeader);
LogPacketHeaderEntry entry{ const LogPacketHeaderEntry entry{
.pid = header.pid, .pid = header.pid,
.tid = header.tid, .tid = header.tid,
.severity = header.severity, .severity = header.severity,
@ -105,16 +105,17 @@ private:
if (True(header.flags & LogPacketFlags::Head)) { if (True(header.flags & LogPacketFlags::Head)) {
std::vector<u8> tmp(data.size() - sizeof(LogPacketHeader)); std::vector<u8> tmp(data.size() - sizeof(LogPacketHeader));
std::memcpy(tmp.data(), data.data() + offset, tmp.size()); std::memcpy(tmp.data(), data.data() + offset, tmp.size());
entries[entry] = std::move(tmp); entries.insert_or_assign(entry, std::move(tmp));
} else { } else {
const auto entry_iter = entries.find(entry);
// Append to existing entry // Append to existing entry
if (!entries.contains(entry)) { if (entry_iter == entries.cend()) {
LOG_ERROR(Service_LM, "Log entry does not exist!"); LOG_ERROR(Service_LM, "Log entry does not exist!");
return; return;
} }
std::vector<u8> tmp(data.size() - sizeof(LogPacketHeader));
auto& existing_entry = entries[entry]; auto& existing_entry = entry_iter->second;
const auto base = existing_entry.size(); const auto base = existing_entry.size();
existing_entry.resize(base + (data.size() - sizeof(LogPacketHeader))); existing_entry.resize(base + (data.size() - sizeof(LogPacketHeader)));
std::memcpy(existing_entry.data() + base, data.data() + offset, std::memcpy(existing_entry.data() + base, data.data() + offset,