From f5b465d615b4da5c42cd5d87f4db6d3409125a98 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 22 Jun 2018 13:12:05 +0100
Subject: [PATCH] Simplify code to avoid Visual Studio warnings

---
 src/solvers/flattening/boolbv_get.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/solvers/flattening/boolbv_get.cpp b/src/solvers/flattening/boolbv_get.cpp
index 71d94d02f8a..5fe67d7d85b 100644
--- 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);
     }