archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Savestates/MSVC: Replace bugged std::unique (compiler bug)

Browse source
This commit is contained in:
Eladash 2022-07-25 23:24:55 +03:00 • committed by Ivan
parent c75b76ddf5
commit cf77bb7cfc
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/Memory/vm.cpp
View file

@ -2008,10 +2008,27 @@ namespace vm
if (loc) loc->get_shared_memory(shared); if (loc) loc->get_shared_memory(shared);
} }
shared.erase(std::unique(shared.begin(), shared.end(), [](auto& a, auto& b) { return a.first == b.first; }), shared.end());
std::map<utils::shm*, usz> shared_map; std::map<utils::shm*, usz> shared_map;
#ifndef _MSC_VER
shared.erase(std::unique(shared.begin(), shared.end(), [](auto& a, auto& b) { return a.first == b.first; }), shared.end());
#else
// Workaround for bugged std::unique
for (auto it = shared.begin(); it != shared.end();)
{
if (shared_map.count(it->first))
{
it = shared.erase(it);
continue;
}
shared_map.emplace(it->first, 0);
it++;
}
shared_map.clear();
#endif
for (auto& p : shared) for (auto& p : shared)
{ {
shared_map.emplace(p.first, &p - shared.data()); shared_map.emplace(p.first, &p - shared.data());