From 4b93727413afea56f3129b2ba75887609a0a7933 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Wed, 13 Apr 2022 10:32:24 -0600 Subject: [PATCH] Enable MSVC standards conformance --- cmake/CompilerWarnings.cmake | 2 +- include/SFML/System/Vector2.inl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake index 0f95e6e6..87903b4b 100644 --- a/cmake/CompilerWarnings.cmake +++ b/cmake/CompilerWarnings.cmake @@ -27,7 +27,7 @@ function(set_file_warnings) /w14905 # wide string literal cast to 'LPSTR' /w14906 # string literal cast to 'LPWSTR' /w14928 # illegal copy-initialization; more than one user-defined conversion has been implicitly applied - # /permissive- # standards conformance mode for MSVC compiler. Disabled until all out-of-the-box Windows SDKs can successfully build with it. + /permissive- # standards conformance mode # Disables, remove when appropriate /wd4996 # disable warnings about deprecated functions diff --git a/include/SFML/System/Vector2.inl b/include/SFML/System/Vector2.inl index 9a256d0f..e00df846 100644 --- a/include/SFML/System/Vector2.inl +++ b/include/SFML/System/Vector2.inl @@ -288,7 +288,7 @@ constexpr bool operator !=(const Vector2& left, const Vector2& right) //////////////////////////////////////////////////////////// template -constexpr Vector2 Vector2::UnitX(static_cast(1), static_cast(0)); +const Vector2 Vector2::UnitX(static_cast(1), static_cast(0)); template -constexpr Vector2 Vector2::UnitY(static_cast(0), static_cast(1)); +const Vector2 Vector2::UnitY(static_cast(0), static_cast(1));