From feb1774eb20c1c1ceb3956c232d5d9bd476c28df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 25 Dec 2021 20:25:43 +0100 Subject: [PATCH] Update Algorithm.inl --- include/Nazara/Core/Algorithm.inl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/include/Nazara/Core/Algorithm.inl b/include/Nazara/Core/Algorithm.inl index 943b76a65..600d44825 100644 --- a/include/Nazara/Core/Algorithm.inl +++ b/include/Nazara/Core/Algorithm.inl @@ -296,12 +296,13 @@ namespace Nz template To SafeCast(From value) { +#ifdef NAZARA_COMPILER_MSVC + // Disable unreachable code warnings + #pragma warning(push) + #pragma warning(disable: 4702) +#endif + #if defined(NAZARA_DEBUG) && !defined(NDEBUG) - #ifdef NAZARA_COMPILER_MSVC - // Disable unreachable code warnings - #pragma warning(push) - #pragma warning(disable: 4702) - #endif if constexpr (std::is_integral_v) { @@ -375,12 +376,13 @@ namespace Nz } } - #ifdef NAZARA_COMPILER_MSVC - #pragma warning(pop) - #endif #endif return static_cast(value); + +#ifdef NAZARA_COMPILER_MSVC + #pragma warning(pop) +#endif } template