Changeset 20256 in vbox

Timestamp:

Jun 4, 2009 8:55:28 AM (16 years ago)

Author:

vboxsync

Message:

Runtime/rand: compiler warnings / typecast fixes

Location:

trunk/src/VBox/Runtime/common/rand

Files:

• randadv.cpp (modified) (2 diffs)
• randparkmiller.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/rand/randadv.cpp

@@ -315 +315 @@
 DECLCALLBACK(uint32_t)  rtRandAdvSynthesizeU32FromU64(PRTRANDINT pThis, uint32_t u32First, uint32_t u32Last)
 {
-    return pThis->pfnGetU64(pThis, u32First, u32Last);
+    return (uint32_t)pThis->pfnGetU64(pThis, u32First, u32Last);
 }
 
@@ -358 +358 @@
     uint64_t off = u64Last - u64First;
     if (off <= UINT32_MAX)
-        return pThis->pfnGetU32(pThis, 0, off) + u64First;
-
-    return (    pThis->pfnGetU32(pThis, 0, UINT32_MAX)
+        return (uint64_t)pThis->pfnGetU32(pThis, 0, off) + u64First;
+
+    return (    (uint64_t)pThis->pfnGetU32(pThis, 0, UINT32_MAX)
             |  ((uint64_t)pThis->pfnGetU32(pThis, 0, off >> 32) << 32))
          + u64First;

trunk/src/VBox/Runtime/common/rand/randparkmiller.cpp

@@ -118 +118 @@
 static DECLCALLBACK(int) rtRandParkMillerSeed(PRTRANDINT pThis, uint64_t u64Seed)
 {
-    pThis->u.ParkMiller.u32Ctx = u64Seed;
+    pThis->u.ParkMiller.u32Ctx = (uint32_t)u64Seed;
     pThis->u.ParkMiller.u32Bits = 0;
     pThis->u.ParkMiller.cBits = 0;