Use numeric_cast_v<unsigned> instead of deprecated integer2unsigned

Author: tautschnig

src/util/arith_tools.cpp

@@ -100,7 +100,7 @@ bool to_unsigned_integer(const constant_exprt &expr, unsigned &uint_value)
     return true;
   else
   {
-    uint_value=integer2unsigned(i);
+    uint_value = numeric_cast_v<unsigned>(i);
     return false;
   }
 }
@@ -240,7 +240,7 @@ mp_integer power(const mp_integer &base,
     case 2:
       {
         mp_integer result;
-        result.setPower2(exponent.to_ulong());
+        result.setPower2(numeric_cast_v<unsigned>(exponent));
         return result;
       }
     case 1: return 1;

src/util/config.cpp

@@ -1106,7 +1106,7 @@ static unsigned unsigned_from_ns(
     throw
       "failed to convert symbol table configuration entry `"+id2string(id)+"'";
 
-  return integer2unsigned(int_value);
+  return numeric_cast_v<unsigned>(int_value);
 }
 
 void configt::set_from_symbol_table(

src/util/ieee_float.cpp

@@ -8,7 +8,6 @@ Author: Daniel Kroening, [email protected]
 
 #include "ieee_float.h"
 
-#include <cstdint>
 #include <ostream>
 #include <cassert>
 #include <cmath>
@@ -1164,7 +1163,11 @@ bool ieee_floatt::is_float() const
 /// for NaN.
 double ieee_floatt::to_double() const
 {
-  union { double f; uint64_t i; } a;
+  static_assert(
+    sizeof(unsigned long long) == sizeof(double),
+    "ieee_floatt::to_double not supported on this architecture");
+
+  union { double f; unsigned long long i; } a;
 
   if(infinity_flag)
   {
@@ -1193,12 +1196,11 @@ double ieee_floatt::to_double() const
 /// for NaN.
 float ieee_floatt::to_float() const
 {
-  if(sizeof(unsigned)!=sizeof(float))
-  {
-    throw "ieee_floatt::to_float not supported on this architecture";
-  }
+  static_assert(
+    sizeof(unsigned) == sizeof(float),
+    "ieee_floatt::to_float not supported on this architecture");
 
-  union { float f; uint32_t i; } a;
+  union { float f; unsigned i; } a;
 
   if(infinity_flag)
   {
@@ -1219,7 +1221,7 @@ float ieee_floatt::to_float() const
   mp_integer i=pack();
   assert(i.is_ulong());
 
-  a.i=i.to_ulong();
+  a.i = numeric_cast_v<unsigned>(i);
   return a.f;
 }