Resolved some IntelliSense issues for the Xbox One XDK

wumiliu · Jan 24, 2017 · 3af2b50 · 3af2b50
1 parent f7954ad
commit 3af2b50
Showing 1 changed file with 35 additions and 31 deletions.
diff --git a/Inc/DirectXMath.h b/Inc/DirectXMath.h
@@ -24,8 +24,10 @@
 #endif
 
 #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) && !defined(_M_HYBRID_X86_ARM64) && (!_MANAGED) && (!_M_CEE) && (!defined(_M_IX86_FP) || (_M_IX86_FP > 1)) && !defined(_XM_NO_INTRINSICS_) && !defined(_XM_VECTORCALL_)
+#if ((_MSC_FULL_VER >= 170065501) && (_MSC_VER < 1800)) || (_MSC_FULL_VER >= 180020418)
 #define _XM_VECTORCALL_ 1
 #endif
+#endif
 
 #if _XM_VECTORCALL_
 #define XM_CALLCONV __vectorcall
@@ -40,8 +42,10 @@
 #endif
 
 #if defined(_MSC_VER) && (_MSC_FULL_VER < 190023506)
-#define XM_CONSTEXPR const
+#define XM_CONST const
+#define XM_CONSTEXPR
 #else
+#define XM_CONST constexpr
 #define XM_CONSTEXPR constexpr
 #endif
 
@@ -189,36 +193,36 @@ namespace DirectX
 #undef XM_CACHE_LINE_SIZE
 #endif
 
-XM_CONSTEXPR float XM_PI        = 3.141592654f;
-XM_CONSTEXPR float XM_2PI       = 6.283185307f;
-XM_CONSTEXPR float XM_1DIVPI    = 0.318309886f;
-XM_CONSTEXPR float XM_1DIV2PI   = 0.159154943f;
-XM_CONSTEXPR float XM_PIDIV2    = 1.570796327f;
-XM_CONSTEXPR float XM_PIDIV4    = 0.785398163f;
-
-XM_CONSTEXPR uint32_t XM_SELECT_0   = 0x00000000;
-XM_CONSTEXPR uint32_t XM_SELECT_1   = 0xFFFFFFFF;
-
-XM_CONSTEXPR uint32_t XM_PERMUTE_0X = 0;
-XM_CONSTEXPR uint32_t XM_PERMUTE_0Y = 1;
-XM_CONSTEXPR uint32_t XM_PERMUTE_0Z = 2;
-XM_CONSTEXPR uint32_t XM_PERMUTE_0W = 3;
-XM_CONSTEXPR uint32_t XM_PERMUTE_1X = 4;
-XM_CONSTEXPR uint32_t XM_PERMUTE_1Y = 5;
-XM_CONSTEXPR uint32_t XM_PERMUTE_1Z = 6;
-XM_CONSTEXPR uint32_t XM_PERMUTE_1W = 7;
-
-XM_CONSTEXPR uint32_t XM_SWIZZLE_X  = 0;
-XM_CONSTEXPR uint32_t XM_SWIZZLE_Y  = 1;
-XM_CONSTEXPR uint32_t XM_SWIZZLE_Z  = 2;
-XM_CONSTEXPR uint32_t XM_SWIZZLE_W  = 3;
-
-XM_CONSTEXPR uint32_t XM_CRMASK_CR6         = 0x000000F0;
-XM_CONSTEXPR uint32_t XM_CRMASK_CR6TRUE     = 0x00000080;
-XM_CONSTEXPR uint32_t XM_CRMASK_CR6FALSE    = 0x00000020;
-XM_CONSTEXPR uint32_t XM_CRMASK_CR6BOUNDS   = XM_CRMASK_CR6FALSE;
-
-XM_CONSTEXPR size_t XM_CACHE_LINE_SIZE = 64;
+XM_CONST float XM_PI        = 3.141592654f;
+XM_CONST float XM_2PI       = 6.283185307f;
+XM_CONST float XM_1DIVPI    = 0.318309886f;
+XM_CONST float XM_1DIV2PI   = 0.159154943f;
+XM_CONST float XM_PIDIV2    = 1.570796327f;
+XM_CONST float XM_PIDIV4    = 0.785398163f;
+
+XM_CONST uint32_t XM_SELECT_0   = 0x00000000;
+XM_CONST uint32_t XM_SELECT_1   = 0xFFFFFFFF;
+
+XM_CONST uint32_t XM_PERMUTE_0X = 0;
+XM_CONST uint32_t XM_PERMUTE_0Y = 1;
+XM_CONST uint32_t XM_PERMUTE_0Z = 2;
+XM_CONST uint32_t XM_PERMUTE_0W = 3;
+XM_CONST uint32_t XM_PERMUTE_1X = 4;
+XM_CONST uint32_t XM_PERMUTE_1Y = 5;
+XM_CONST uint32_t XM_PERMUTE_1Z = 6;
+XM_CONST uint32_t XM_PERMUTE_1W = 7;
+
+XM_CONST uint32_t XM_SWIZZLE_X  = 0;
+XM_CONST uint32_t XM_SWIZZLE_Y  = 1;
+XM_CONST uint32_t XM_SWIZZLE_Z  = 2;
+XM_CONST uint32_t XM_SWIZZLE_W  = 3;
+
+XM_CONST uint32_t XM_CRMASK_CR6         = 0x000000F0;
+XM_CONST uint32_t XM_CRMASK_CR6TRUE     = 0x00000080;
+XM_CONST uint32_t XM_CRMASK_CR6FALSE    = 0x00000020;
+XM_CONST uint32_t XM_CRMASK_CR6BOUNDS   = XM_CRMASK_CR6FALSE;
+
+XM_CONST size_t XM_CACHE_LINE_SIZE = 64;
 
 
 /****************************************************************************