From 6ca816e011c03f90f9ef6800c747c030df54c0cf Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 12 Mar 2017 21:55:15 -0700
Subject: [PATCH 1/2] common/cpu_detect: Add missing include and fix namespace
 scope

---
 src/common/x64/cpu_detect.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp
index 370ae2c805..2cb3ab9cc4 100644
--- a/src/common/x64/cpu_detect.cpp
+++ b/src/common/x64/cpu_detect.cpp
@@ -8,9 +8,9 @@
 #include "common/common_types.h"
 #include "cpu_detect.h"
 
-namespace Common {
-
-#ifndef _MSC_VER
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
 
 #if defined(__DragonFly__) || defined(__FreeBSD__)
 // clang-format off
@@ -37,13 +37,15 @@ static inline void __cpuid(int info[4], int function_id) {
 }
 
 #define _XCR_XFEATURE_ENABLED_MASK 0
-static u64 _xgetbv(u32 index) {
+static inline u64 _xgetbv(u32 index) {
     u32 eax, edx;
     __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
     return ((u64)edx << 32) | eax;
 }
 
-#endif // ifndef _MSC_VER
+#endif // _MSC_VER
+
+namespace Common {
 
 // Detects the various CPU features
 static CPUCaps Detect() {

From 24e0b1ed8d4a24c814496e1b36236687fc0d442f Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 12 Mar 2017 22:16:27 -0700
Subject: [PATCH 2/2] externals: Update to boost v1.63.0

---
 externals/boost | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/externals/boost b/externals/boost
index f005c955f8..3519723963 160000
--- a/externals/boost
+++ b/externals/boost
@@ -1 +1 @@
-Subproject commit f005c955f8147a29667aa0b65257abc3dd520b0c
+Subproject commit 351972396392c97a659b9a02f34ce9269293d21f