Changeset 96118 in vbox for trunk/src/VBox/Runtime/common/math

Timestamp:

Aug 8, 2022 9:32:52 PM (3 years ago)

Author:

vboxsync

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

152920

Message:

IPRT/nocrt: llround, llroundf and llroundl. bugref:10261

Location:

trunk/src/VBox/Runtime/common/math

Files:

• llround.cpp (copied) (copied from trunk/src/VBox/Runtime/common/math/lround.cpp ) (2 diffs)
• llroundf.cpp (copied) (copied from trunk/src/VBox/Runtime/common/math/lroundf.cpp ) (2 diffs)
• llroundl.cpp (copied) (copied from trunk/src/VBox/Runtime/common/math/lroundl.cpp ) (2 diffs)
• lroundf.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/math/llround.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - lround().
+ * IPRT - No-CRT - llround().
  */
 
@@ -35 +35 @@
 
 
-#undef lround
-long RT_NOCRT(lround)(double rd)
+#undef llround
+long long RT_NOCRT(llround)(double rd)
 {
     if (isfinite(rd))
     {
         rd = round(rd);
-        if (rd >= (double)LONG_MIN && rd <= (double)LONG_MAX)
+        if (rd >= (double)LLONG_MIN && rd <= (double)LLONG_MAX)
             return (long)rd;
         // @todo RT_NOCRT(feraiseexcept)(FE_INVALID);
-        return rd > 0 ? LONG_MAX : LONG_MIN;
+        return rd > 0 ? LLONG_MAX : LLONG_MIN;
     }
     // @todo RT_NOCRT(feraiseexcept)(FE_INVALID);
-    return LONG_MAX;
+    return LLONG_MAX;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(lround);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(llround);
 

trunk/src/VBox/Runtime/common/math/llroundf.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - lroundf().
+ * IPRT - No-CRT - llroundf().
  */
 
@@ -35 +35 @@
 
 
-#undef lroundf
-long RT_NOCRT(lroundf)(float r32)
+#undef llroundf
+long long RT_NOCRT(llroundf)(float r32)
 {
     if (isfinite(r32))
     {
         r32 = roundf(r32);
-        if (r32 >= (double)LONG_MIN && r32 <= (double)LONG_MAX)
+        if (r32 >= (float)LLONG_MIN && r32 <= (float)LLONG_MAX)
             return (long)r32;
         // @todo RT_NOCRT(feraiseexcept)(FE_INVALID);
-        return r32 > 0 ? LONG_MAX : LONG_MIN;
+        return r32 > 0 ? LLONG_MAX : LLONG_MIN;
     }
     // @todo RT_NOCRT(feraiseexcept)(FE_INVALID);
-    return LONG_MAX;
+    return LLONG_MAX;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(lroundf);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(llroundf);
 
 

trunk/src/VBox/Runtime/common/math/llroundl.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - lroundl().
+ * IPRT - No-CRT - llroundl().
  */
 
@@ -35 +35 @@
 
 
-#undef lroundl
-long RT_NOCRT(lroundl)(long double lrd)
+#undef llroundl
+long long RT_NOCRT(llroundl)(long double lrd)
 {
     if (isfinite(lrd))
     {
         lrd = roundl(lrd);
-        if (lrd >= (long double)LONG_MIN && lrd <= (long double)LONG_MAX)
+        if (lrd >= (long double)LLONG_MIN && lrd <= (long double)LLONG_MAX)
             return (long)lrd;
         // @todo RT_NOCRT(feraiseexcept)(FE_INVALID);
-        return lrd > 0 ? LONG_MAX : LONG_MIN;
+        return lrd > 0 ? LLONG_MAX : LLONG_MIN;
     }
     // @todo RT_NOCRT(feraiseexcept)(FE_INVALID);
-    return LONG_MAX;
+    return LLONG_MAX;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(lroundl);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(llroundl);
 

trunk/src/VBox/Runtime/common/math/lroundf.cpp

@@ -41 +41 @@
     {
         r32 = roundf(r32);
-        if (r32 >= (double)LONG_MIN && r32 <= (double)LONG_MAX)
+        if (r32 >= (float)LONG_MIN && r32 <= (float)LONG_MAX)
             return (long)r32;
         // @todo RT_NOCRT(feraiseexcept)(FE_INVALID);