Use numberingt in place of hash_numberingt

Because the naming follows our coding standards and it reduces the
number of numbering variations to maintain.

Author: thomasspriggs

src/analyses/invariant_set.h

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

src/pointer-analysis/object_numbering.h

@@ -25,6 +25,6 @@ Author: Daniel Kroening, [email protected]
 #include <util/expr.h>
 #include <util/numbering.h>
 
-typedef hash_numbering<exprt, irep_hash> object_numberingt;
+typedef numberingt<exprt, irep_hash> object_numberingt;
 
 #endif // CPROVER_POINTER_ANALYSIS_OBJECT_NUMBERING_H

src/pointer-analysis/value_set_fi.cpp

@@ -29,7 +29,7 @@ Author: Daniel Kroening, [email protected]
 const value_set_fit::object_map_dt value_set_fit::object_map_dt::blank{};
 
 object_numberingt value_set_fit::object_numbering;
-hash_numbering<irep_idt, irep_id_hash> value_set_fit::function_numbering;
+numberingt<irep_idt> value_set_fit::function_numbering;
 
 static const char *alloc_adapter_prefix="alloc_adaptor::";
 

src/pointer-analysis/value_set_fi.h

@@ -39,7 +39,7 @@ class value_set_fit
   unsigned to_function, from_function;
   unsigned to_target_index, from_target_index;
   static object_numberingt object_numbering;
-  static hash_numbering<irep_idt, irep_id_hash> function_numbering;
+  static numberingt<irep_idt> function_numbering;
 
   void set_from(const irep_idt &function, unsigned inx)
   {

src/pointer-analysis/value_set_fivr.h

@@ -36,7 +36,7 @@ class value_set_fivrt
   unsigned to_function, from_function;
   unsigned to_target_index, from_target_index;
   static object_numberingt object_numbering;
-  static hash_numbering<irep_idt, irep_id_hash> function_numbering;
+  static numberingt<irep_idt> function_numbering;
 
   void set_from(const irep_idt &function, unsigned inx)
   {

src/pointer-analysis/value_set_fivrns.h

@@ -37,7 +37,7 @@ class value_set_fivrnst
   unsigned to_function, from_function;
   unsigned to_target_index, from_target_index;
   static object_numberingt object_numbering;
-  static hash_numbering<irep_idt, irep_id_hash> function_numbering;
+  static numberingt<irep_idt> function_numbering;
 
   void set_from(const irep_idt &function, unsigned inx)
   {

src/solvers/flattening/pointer_logic.h

@@ -23,7 +23,7 @@ class pointer_logict
 {
 public:
   // this numbers the objects
-  hash_numbering<exprt, irep_hash> objects;
+  numberingt<exprt, irep_hash> objects;
 
   struct pointert
   {

src/util/irep_hash_container.h

@@ -69,8 +69,7 @@ class irep_hash_container_baset
     std::size_t operator()(const packedt &p) const;
   };
 
-  typedef hash_numbering<packedt, vector_hasht> numberingt;
-  numberingt numbering;
+  numberingt<packedt, vector_hasht> numbering;
 
   void pack(const irept &irep, packedt &);
 

src/util/numbering.h

@@ -112,10 +112,6 @@ class template_numberingt final
 template <typename Key>
 using numbering = template_numberingt<std::map<Key, std::size_t>>; // NOLINT
 
-template <typename Key, typename Hash>
-using hash_numbering = // NOLINT
-  template_numberingt<std::unordered_map<Key, std::size_t, Hash>>;
-
 /// \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>>