summaryrefslogtreecommitdiff
path: root/Source/Core/Common/x64CPUDetect.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-20 02:08:44 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-20 02:08:44 +0100
commit6d8df311a32cd9841aa9fa81228f3ba5180d26be (patch)
treecfa2e210a36bbe5063fdbc23e4cbbfd3d78b63a4 /Source/Core/Common/x64CPUDetect.cpp
parentafba0d736d363fa4c71b86d84a1caad3d52f147e (diff)
parent24ba058404d8036a977a41e55c58a7326302cb34 (diff)
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/Common/x64CPUDetect.cpp')
-rw-r--r--Source/Core/Common/x64CPUDetect.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp
index b9ed2b538a..f9a51608e6 100644
--- a/Source/Core/Common/x64CPUDetect.cpp
+++ b/Source/Core/Common/x64CPUDetect.cpp
@@ -2,8 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include <memory.h>
-#include "Common.h"
+#include <memory>
+
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "Common/StringUtil.h"
#ifdef _WIN32
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
@@ -85,10 +88,6 @@ static unsigned long long _xgetbv(unsigned int index)
#endif
-#include "Common.h"
-#include "CPUDetect.h"
-#include "StringUtil.h"
-
CPUInfo cpu_info;
CPUInfo::CPUInfo() {