Changeset 96098 in vbox for trunk/include/iprt/nocrt

Timestamp:

Aug 7, 2022 7:04:19 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152897

Message:

IPRT/nocrt: Math constants: HUGH_VAL*, NAN, INFINITY. bugref:10261

File:

• trunk/include/iprt/nocrt/math.h (modified) (4 diffs)

trunk/include/iprt/nocrt/math.h

@@ -64 +64 @@
  */
 extern const union __infinity_un {
-    unsigned char   __uc[8];
-    double      __ud;
+    RTFLOAT64U      __uu;
+    double          __ud;
 } RT_NOCRT(__infinity);
 
-extern const union __nan_un {
-    unsigned char   __uc[sizeof(float)];
-    float       __uf;
-} RT_NOCRT(__nan);
+extern const union __nanf_un {
+    RTFLOAT32U      __uu;
+    float           __uf;
+} RT_NOCRT(__nanf);
 
 #if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
@@ -81 +81 @@
 #endif
 
-#ifdef __MATH_BUILTIN_CONSTANTS
-#define HUGE_VAL    __builtin_huge_val()
+#if defined(__MATH_BUILTIN_CONSTANTS) \
+ || (RT_MSC_PREREQ(RT_MSC_VER_VC140) && defined(__cplusplus)) /** @todo when was this added exactly? 2015, 2017 & 2019 has it for C++. */
+# define HUGE_VAL   __builtin_huge_val()
 #else
-#define HUGE_VAL    (RT_NOCRT(__infinity).__ud)
+# define HUGE_VAL   (RT_NOCRT(__infinity).__ud)
 #endif
 
@@ -483 +484 @@
 
 #ifdef __MATH_BUILTIN_CONSTANTS
-#define HUGE_VALF   __builtin_huge_valf()
-#define HUGE_VALL   __builtin_huge_vall()
-#define INFINITY    __builtin_inf()
-#define NAN     __builtin_nan("")
+# define HUGE_VALF   __builtin_huge_valf()
+# define HUGE_VALL   __builtin_huge_vall()
+# define INFINITY    __builtin_inf()
+# define NAN         __builtin_nan("")
+#elif RT_MSC_PREREQ(RT_MSC_VER_VC140) && defined(__cplusplus)
+/** @todo When were these introduced exactly? 2015, 2017 & 2019 has them.
+ * However, they only work in C++ even if the c1.dll includes the strings. Oh, well. */
+# define HUGE_VALF   __builtin_huge_valf()
+# define HUGE_VALL   __builtin_huge_val()
+# define INFINITY    __builtin_huge_val()
+# define NAN         __builtin_nan("0")     /* same as we use in climits */
 #else
-#define HUGE_VALF   (float)HUGE_VAL
-#define HUGE_VALL   (long double)HUGE_VAL
-#define INFINITY    HUGE_VALF
-#define NAN     (__nan.__uf)
+# define HUGE_VALF   (float)HUGE_VAL
+# define HUGE_VALL   (long double)HUGE_VAL
+# define INFINITY    HUGE_VALF
+# define NAN         (__nanf.__uf)
 #endif /* __MATH_BUILTIN_CONSTANTS */
 
@@ -566 +574 @@
 #if !defined(RT_WITHOUT_NOCRT_WRAPPERS) && !defined(RT_WITHOUT_NOCRT_WRAPPER_ALIASES)
 /* sed -e "/#/d" -e "/RT_NOCRT/!d" -e "s/^.*RT_NOCRT(\([a-z0-9_]*\)).*$/# define \1 RT_NOCRT(\1)/" */
-# define __infinity RT_NOCRT(__infinity)
-# define __nan RT_NOCRT(__nan)
 # define __fpclassifyf RT_NOCRT(__fpclassifyf)
 # define __fpclassifyd RT_NOCRT(__fpclassifyd)