Simplify code to avoid Visual Studio warnings

tautschnig · tautschnig · commit f5b465d615b4 · 2018-06-24T10:09:54.000+01:00
diff --git a/src/solvers/flattening/boolbv_get.cpp b/src/solvers/flattening/boolbv_get.cpp
@@ -222,10 +222,8 @@ exprt boolbvt::bv_get_rec(
 
   for(std::size_t bit_nr=offset; bit_nr<offset+width; bit_nr++)
   {
-    char ch;
-    if(unknown[bit_nr])
-      ch='0';
-    else
+    char ch = '0';
+    if(!unknown[bit_nr])
     {
       switch(prop.l_get(bv[bit_nr]).get_value())
       {
@@ -249,7 +247,7 @@ exprt boolbvt::bv_get_rec(
       if(int_value>=string_numbering.size())
         s=irep_idt();
       else
-        s=string_numbering[int_value.to_long()];
+        s = string_numbering[numeric_cast_v<std::size_t>(int_value)];
 
       return constant_exprt(s, type);
     }

Original file line number	Diff line number	Diff line change
`@@ -222,10 +222,8 @@ exprt boolbvt::bv_get_rec(`
`222`	`222`
`223`	`223`	`for(std::size_t bit_nr=offset; bit_nr<offset+width; bit_nr++)`
`224`	`224`	`{`
`225`		`- char ch;`
`226`		`- if(unknown[bit_nr])`
`227`		`- ch='0';`
`228`		`- else`
	`225`	`+ char ch = '0';`
	`226`	`+ if(!unknown[bit_nr])`
`229`	`227`	`{`
`230`	`228`	`switch(prop.l_get(bv[bit_nr]).get_value())`
`231`	`229`	`{`
`@@ -249,7 +247,7 @@ exprt boolbvt::bv_get_rec(`
`249`	`247`	`if(int_value>=string_numbering.size())`
`250`	`248`	`s=irep_idt();`
`251`	`249`	`else`
`252`		`- s=string_numbering[int_value.to_long()];`
	`250`	`+ s = string_numbering[numeric_cast_v<std::size_t>(int_value)];`
`253`	`251`
`254`	`252`	`return constant_exprt(s, type);`
`255`	`253`	`}`