未验证 提交 34578b42 编写于 作者: V Vatsan Madhavan 提交者: GitHub

Merge pull request #2573 from wpfcontrib/update-win10-sdk-to-18362

Update win10 sdk used by WPF builds to 18362
......@@ -6,8 +6,8 @@
<!-- v142 = Visual Studio 2019 -->
<PlatformToolset>v142</PlatformToolset>
<!-- 17134 is Windows 10 v1803 (RS4) SDK -->
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
<!-- 17134 is Windows 10 v1903 (19H1) SDK -->
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<ConfigurationType Condition="'$(ConfigurationType)'==''">DynamicLibrary</ConfigurationType>
......
......@@ -80,7 +80,7 @@ namespace dxlayer
return DirectX::XMLoadFloat4x4(&xmFloat4x4);
}
inline operator DirectX::XMFLOAT4X4() const
inline operator const DirectX::XMFLOAT4X4() const
{
return DirectX::XMFLOAT4X4
(
......
......@@ -91,7 +91,7 @@ namespace dxlayer
return xmFloat4;
}
inline operator DirectX::XMFLOAT4() const
inline operator const DirectX::XMFLOAT4() const
{
return DirectX::XMFLOAT4(x, y, z, w);
}
......
......@@ -226,7 +226,7 @@ namespace dxlayer
}
public:
inline operator DirectX::XMFLOAT3() const
inline operator const DirectX::XMFLOAT3() const
{
return DirectX::XMFLOAT3(x, y, z);
}
......
......@@ -110,7 +110,7 @@ namespace dxlayer
return{ x, y, z, w };
}
operator DirectX::XMFLOAT4() const
operator const DirectX::XMFLOAT4() const
{
return{ x, y, z, w };
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册