Use numberingt in place of numbering

Because the naming follows our coding standards and it reduces the
number of numbering variations to maintain. This does change the type of
backing container used in these places, however the performance should
be at least equivalent.

Author: thomasspriggs

src/analyses/custom_bitvector_analysis.h

@@ -163,7 +163,7 @@ class custom_bitvector_analysist:public ait<custom_bitvector_domaint>
 
   unsigned get_bit_nr(const exprt &);
 
-  typedef numbering<irep_idt> bitst;
+  typedef numberingt<irep_idt> bitst;
   bitst bits;
 
 protected:

src/analyses/escape_analysis.h

@@ -120,7 +120,7 @@ class escape_analysist:public ait<escape_domaint>
   {
   }
 
-  numbering<irep_idt> bits;
+  numberingt<irep_idt> bits;
 
   void insert_cleanup(
     goto_functionst::goto_functiont &,

src/analyses/invariant_set.h

@@ -55,7 +55,7 @@ class inv_object_storet
 protected:
   const namespacet &ns;
 
-  typedef numbering<irep_idt> mapt;
+  typedef numberingt<irep_idt> mapt;
   mapt map;
 
   struct entryt

src/analyses/local_bitvector_analysis.h

@@ -183,7 +183,7 @@ class local_bitvector_analysist
 
   typedef std::stack<unsigned> work_queuet;
 
-  numbering<irep_idt> pointers;
+  numberingt<irep_idt> pointers;
 
   // pointers -> flagst
   // This is a vector, so it's fast.

src/analyses/local_may_alias.h

@@ -60,7 +60,7 @@ class local_may_aliast
 
   typedef std::stack<local_cfgt::node_nrt> work_queuet;
 
-  mutable numbering<exprt> objects;
+  mutable numberingt<exprt, irep_hash> objects;
 
   typedef unsigned_union_find alias_sett;
 

src/goto-programs/vcd_goto_trace.cpp

@@ -82,7 +82,7 @@ void output_vcd(
 
   // we first collect all variables that are assigned
 
-  numbering<irep_idt> n;
+  numberingt<irep_idt> n;
 
   for(const auto &step : goto_trace.steps)
   {

src/solvers/flattening/boolbv.h

@@ -262,7 +262,7 @@ class boolbvt:public arrayst
   offset_mapt build_offset_map(const struct_typet &src);
 
   // strings
-  numbering<irep_idt> string_numbering;
+  numberingt<irep_idt> string_numbering;
 };
 
 #endif // CPROVER_SOLVERS_FLATTENING_BOOLBV_H

src/util/numbering.h

@@ -9,7 +9,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_UTIL_NUMBERING_H
 #define CPROVER_UTIL_NUMBERING_H
 
-#include <map>
 #include <unordered_map>
 #include <vector>
 
@@ -109,9 +108,6 @@ class template_numberingt final
   }
 };
 
-template <typename Key>
-using numbering = template_numberingt<std::map<Key, std::size_t>>; // NOLINT
-
 /// \tparam keyt: The type of keys which will be numbered.
 /// \tparam hasht: The type of hashing functor used to hash keys.
 template <typename keyt, typename hasht = std::hash<keyt>>