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

ChunkFile: Replace macro with a variable template 

Note that std::is_trivially_copyable_v cannot be used yet (C++17 only).
This commit is contained in:
Léo Lam 2017-12-26 02:18:13 +01:00
parent 8a00a9e149
commit 5b90aba624
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,10 +33,10 @@
#include "Common/Flag.h" #include "Common/Flag.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
// ewww // XXX: Replace this with std::is_trivially_copyable<T> once we stop using volatile
// on things that are put in savestates, as volatile types are not trivially copyable.
#define IsTriviallyCopyable(T) \ template <typename T>
std::is_trivially_copyable<typename std::remove_volatile<T>::type>::value constexpr bool IsTriviallyCopyable = std::is_trivially_copyable<std::remove_volatile_t<T>>::value;
// Wrapper class // Wrapper class
class PointerWrap class PointerWrap
@ -155,7 +155,7 @@ public:
template <typename T> template <typename T>
void DoArray(T* x, u32 count) void DoArray(T* x, u32 count)
{ {
static_assert(IsTriviallyCopyable(T), "Only sane for trivially copyable types"); static_assert(IsTriviallyCopyable<T>, "Only sane for trivially copyable types");
DoVoid(x, count * sizeof(T)); DoVoid(x, count * sizeof(T));
} }
@ -185,7 +185,7 @@ public:
template <typename T> template <typename T>
void Do(T& x) void Do(T& x)
{ {
static_assert(IsTriviallyCopyable(T), "Only sane for trivially copyable types"); static_assert(IsTriviallyCopyable<T>, "Only sane for trivially copyable types");
// Note: // Note:
// Usually we can just use x = **ptr, etc. However, this doesn't work // Usually we can just use x = **ptr, etc. However, this doesn't work
// for unions containing BitFields (long story, stupid language rules) // for unions containing BitFields (long story, stupid language rules)