ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for std::optional to PointerWrap

This commit is contained in:
Pokechu22 2019-12-03 19:15:30 -08:00
parent 04e9279f3d
commit a695b05b21
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Core/Common/ChunkFile.h
View File

@ -19,6 +19,7 @@
#include <deque> #include <deque>
#include <list> #include <list>
#include <map> #include <map>
#include <optional>
#include <set> #include <set>
#include <string> #include <string>
#include <type_traits> #include <type_traits>
@ -144,6 +145,36 @@ public:
Do(x.second); Do(x.second);
} }
template <typename T>
void Do(std::optional<T>& x)
{
bool present = x.has_value();
Do(present);
switch (mode)
{
case MODE_READ:
if (present)
{
x = std::make_optional<T>();
Do(x.value());
}
else
{
x = std::nullopt;
}
break;
case MODE_WRITE:
case MODE_MEASURE:
case MODE_VERIFY:
if (present)
Do(x.value());
break;
}
}
template <typename T, std::size_t N> template <typename T, std::size_t N>
void DoArray(std::array<T, N>& x) void DoArray(std::array<T, N>& x)
{ {