More stuff

Author: kunitoki

modules/yup_core/maths/yup_BigInteger.cpp

@@ -392,7 +392,7 @@ void BigInteger::negate() noexcept
     negative = (! negative) && ! isZero();
 }
 
-#if YUP_MSVC && ! defined(__INTEL_COMPILER)
+#if YUP_MSVC
 #pragma intrinsic(_BitScanReverse)
 #endif
 

modules/yup_core/maths/yup_MathsFunctions.h

@@ -617,9 +617,6 @@ constexpr bool isWithin (Type a, Type b, Type tolerance) noexcept
 //==============================================================================
 #if YUP_MSVC
 #pragma optimize("t", off)
-#ifndef __INTEL_COMPILER
-#pragma float_control(precise, on, push)
-#endif
 #endif
 
 /** Fast floating-point-to-integer conversion.
@@ -633,36 +630,36 @@ constexpr bool isWithin (Type a, Type b, Type tolerance) noexcept
     even numbers will be rounded up or down differently.
 */
 template <typename FloatType>
-int roundToInt (const FloatType value) noexcept
+constexpr int roundToInt (const FloatType value) noexcept
 {
-#ifdef __INTEL_COMPILER
-#pragma float_control(precise, on, push)
-#endif
-
-    union
+    if (isConstantEvaluated())
+    {
+        return static_cast<int> (value > FloatType (0) ? value + FloatType (0.5) : value - FloatType (0.5));
+    }
+    else
     {
-        int asInt[2];
-        double asDouble;
-    } n;
+        union
+        {
+            int asInt[2];
+            double asDouble;
+        } n;
 
-    n.asDouble = ((double) value) + 6755399441055744.0;
+        n.asDouble = ((double) value) + 6755399441055744.0;
 
 #if YUP_BIG_ENDIAN
-    return n.asInt[1];
+        return n.asInt[1];
 #else
-    return n.asInt[0];
+        return n.asInt[0];
 #endif
+    }
 }
 
-inline int roundToInt (int value) noexcept
+constexpr int roundToInt (int value) noexcept
 {
     return value;
 }
 
 #if YUP_MSVC
-#ifndef __INTEL_COMPILER
-#pragma float_control(pop)
-#endif
 #pragma optimize("", on) // resets optimisations to the project defaults
 #endif
 
@@ -671,12 +668,8 @@ inline int roundToInt (int value) noexcept
     This is a slightly slower and slightly more accurate version of roundToInt(). It works
     fine for values above zero, but negative numbers are rounded the wrong way.
 */
-inline int roundToIntAccurate (double value) noexcept
+constexpr int roundToIntAccurate (double value) noexcept
 {
-#ifdef __INTEL_COMPILER
-#pragma float_control(pop)
-#endif
-
     return roundToInt (value + 1.5e-8);
 }
 

modules/yup_core/memory/yup_ByteOrder.h

@@ -189,7 +189,7 @@ inline double ByteOrder::swap (double v) noexcept
     return n.asFloat;
 }
 
-#if YUP_MSVC && ! defined(__INTEL_COMPILER)
+#if YUP_MSVC
 #pragma intrinsic(_byteswap_ulong)
 #endif
 

modules/yup_core/native/yup_SystemStats_windows.cpp

@@ -84,7 +84,7 @@ static int findNumberOfPhysicalCores() noexcept
 
 //==============================================================================
 #if YUP_INTEL
-#if YUP_MSVC && ! defined(__INTEL_COMPILER)
+#if YUP_MSVC
 #pragma intrinsic(__cpuid)
 #pragma intrinsic(__rdtsc)
 #endif

modules/yup_core/system/yup_PlatformDefs.h

@@ -101,9 +101,7 @@ namespace yup
 #elif YUP_WASM
 #define YUP_BREAK_IN_DEBUGGER
 #elif YUP_MSVC
-#ifndef __INTEL_COMPILER
 #pragma intrinsic(__debugbreak)
-#endif
 #define YUP_BREAK_IN_DEBUGGER __debugbreak();
 #elif YUP_INTEL && (YUP_GCC || YUP_CLANG || YUP_MAC)
 #if YUP_NO_INLINE_ASM

modules/yup_core/system/yup_StandardHeader.h

@@ -117,14 +117,6 @@ YUP_BEGIN_IGNORE_WARNINGS_MSVC (4514 4245 4100)
 #if YUP_LINUX || YUP_BSD || YUP_WASM
 #include <cstring>
 #include <signal.h>
-
-#if __INTEL_COMPILER
-#if __ia64__
-#include <ia64intrin.h>
-#else
-#include <ia32intrin.h>
-#endif
-#endif
 #endif
 
 #if YUP_MSVC && YUP_DEBUG
@@ -156,9 +148,6 @@ YUP_END_IGNORE_WARNINGS_MSVC
 #define YUP_API __declspec (dllimport)
 #pragma warning(disable : 4251)
 #endif
-#ifdef __INTEL_COMPILER
-#pragma warning(disable : 1125) // (virtual override warning)
-#endif
 #elif defined(YUP_DLL) || defined(YUP_DLL_BUILD)
 #define YUP_API __attribute__ ((visibility ("default")))
 #endif

modules/yup_core/yup_core.h

@@ -71,9 +71,6 @@
 #pragma warning(push)
 // Disable warnings for long class names, padding, and undefined preprocessor definitions.
 #pragma warning(disable : 4251 4786 4668 4820)
-#ifdef __INTEL_COMPILER
-#pragma warning(disable : 1125)
-#endif
 #endif
 
 #include "system/yup_TargetPlatform.h"