summaryrefslogtreecommitdiff
path: root/Source/Core/Common/LinearDiskCache.h
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-09-10 08:02:48 +0200
committerGitHub <noreply@github.com>2017-09-10 08:02:48 +0200
commitee51ba639908ccbb13c3389344d17d3bbae2da1a (patch)
tree02ccf253c0a7196dbcafd99524c07801d42c4791 /Source/Core/Common/LinearDiskCache.h
parente86713ca6726393f4b5a2dd2240b79828d6fcb4b (diff)
parent696e1b40b58ee1ef9340ceac02059abbe63f3120 (diff)
Merge pull request #6047 from lioncash/version
Common: Move version strings to their own header
Diffstat (limited to 'Source/Core/Common/LinearDiskCache.h')
-rw-r--r--Source/Core/Common/LinearDiskCache.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h
index 630a624d6b..fae1dfc3f5 100644
--- a/Source/Core/Common/LinearDiskCache.h
+++ b/Source/Core/Common/LinearDiskCache.h
@@ -4,14 +4,15 @@
#pragma once
+#include <algorithm>
#include <cstring>
#include <fstream>
#include <string>
#include <type_traits>
-#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
+#include "Common/Version.h"
// On disk format:
// header{
@@ -177,7 +178,8 @@ private:
{
// Null-terminator is intentionally not copied.
std::memcpy(&id, "DCAC", sizeof(u32));
- std::memcpy(ver, scm_rev_git_str.c_str(), std::min(scm_rev_git_str.size(), sizeof(ver)));
+ std::memcpy(ver, Common::scm_rev_git_str.c_str(),
+ std::min(Common::scm_rev_git_str.size(), sizeof(ver)));
}
u32 id;