Object numbering: Remove function call operator

smowton · Nov 20, 2017 · e3e5e48 · e3e5e48
1 parent c4b3335
commit e3e5e48
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/analyses/custom_bitvector_analysis.cpp b/src/analyses/custom_bitvector_analysis.cpp
@@ -181,10 +181,10 @@ unsigned custom_bitvector_analysist::get_bit_nr(
   else if(string_expr.id()==ID_string_constant)
   {
     irep_idt value=string_expr.get(ID_value);
-    return bits(value);
+    return bits.number(value);
   }
   else
-    return bits("(unknown)");
+    return bits.number("(unknown)");
 }
 
 std::set<exprt> custom_bitvector_analysist::aliases(

diff --git a/src/solvers/flattening/boolbv_constant.cpp b/src/solvers/flattening/boolbv_constant.cpp
@@ -48,7 +48,7 @@ bvt boolbvt::convert_constant(const constant_exprt &expr)
   else if(expr_type.id()==ID_string)
   {
     // we use the numbering for strings
-    std::size_t number=string_numbering(expr.get_value());
+    std::size_t number = string_numbering.number(expr.get_value());
     return bv_utils.build_constant(number, bv.size());
   }
   else if(expr_type.id()==ID_range)

diff --git a/src/util/numbering.h b/src/util/numbering.h
@@ -50,11 +50,6 @@ class numbering final
     return (result.first)->second;
   }
 
-  number_type operator()(const T &a)
-  {
-    return number(a);
-  }
-
   optionalt<number_type> get_number(const T &a) const
   {
     const auto it = numbers_.find(a);