Merge pull request #1541 from owen-jones-diffblue/replace-unsigned-with-number-type

Daniel Kroening · web-flow · commit 4d011b5baf20 · 2017-10-31T12:59:15.000Z
Replace unsigned with appropriate type
diff --git a/src/pointer-analysis/value_set.cpp b/src/pointer-analysis/value_set.cpp
@@ -71,7 +71,7 @@ value_sett::entryt &value_sett::get_entry(
 
 bool value_sett::insert(
   object_mapt &dest,
-  unsigned n,
+  object_numberingt::number_type n,
   const objectt &object) const
 {
   auto entry=dest.read().find(n);
diff --git a/src/pointer-analysis/value_set.h b/src/pointer-analysis/value_set.h
@@ -60,7 +60,7 @@ class value_sett
 
   class object_map_dt
   {
-    typedef std::map<unsigned, objectt> data_typet;
+    typedef std::map<object_numberingt::number_type, objectt> data_typet;
     data_typet data;
 
   public:
@@ -132,7 +132,10 @@ class value_sett
     return insert(dest, object_numbering.number(src), objectt(offset));
   }
 
-  bool insert(object_mapt &dest, unsigned n, const objectt &object) const;
+  bool insert(
+    object_mapt &dest,
+    object_numberingt::number_type n,
+    const objectt &object) const;
 
   bool insert(object_mapt &dest, const exprt &expr, const objectt &object) const
   {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ value_sett::entryt &value_sett::get_entry(`
`71`	`71`
`72`	`72`	`bool value_sett::insert(`
`73`	`73`	`object_mapt &dest,`
`74`		`- unsigned n,`
	`74`	`+ object_numberingt::number_type n,`
`75`	`75`	`const objectt &object) const`
`76`	`76`	`{`
`77`	`77`	`auto entry=dest.read().find(n);`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class value_sett`
`60`	`60`
`61`	`61`	`class object_map_dt`
`62`	`62`	`{`
`63`		`- typedef std::map<unsigned, objectt> data_typet;`
	`63`	`+ typedef std::map<object_numberingt::number_type, objectt> data_typet;`
`64`	`64`	`data_typet data;`
`65`	`65`
`66`	`66`	`public:`
`@@ -132,7 +132,10 @@ class value_sett`
`132`	`132`	`return insert(dest, object_numbering.number(src), objectt(offset));`
`133`	`133`	`}`
`134`	`134`
`135`		`- bool insert(object_mapt &dest, unsigned n, const objectt &object) const;`
	`135`	`+ bool insert(`
	`136`	`+ object_mapt &dest,`
	`137`	`+ object_numberingt::number_type n,`
	`138`	`+ const objectt &object) const;`
`136`	`139`
`137`	`140`	`bool insert(object_mapt &dest, const exprt &expr, const objectt &object) const`
`138`	`141`	`{`