Rename type value_type to valuet

danpoe · danpoe · commit 5b5180d76c51 · 2019-04-16T12:29:59.000+01:00
diff --git a/src/util/small_map.h b/src/util/small_map.h
@@ -234,7 +234,7 @@ class small_mapt
 public:
   // Standard const iterator
 
-  typedef std::pair<const std::size_t, const T &> value_type;
+  typedef std::pair<const std::size_t, const T &> valuet;
 
   /// Const iterator
   ///
@@ -255,14 +255,14 @@ class small_mapt
     {
     }
 
-    const value_type operator*() const
+    const valuet operator*() const
     {
-      return value_type(idx, *(m.p + ii));
+      return valuet(idx, *(m.p + ii));
     }
 
-    const std::shared_ptr<value_type> operator->() const
+    const std::shared_ptr<valuet> operator->() const
     {
-      return std::make_shared<value_type>(idx, *(m.p + ii));
+      return std::make_shared<valuet>(idx, *(m.p + ii));
     }
 
     const_iterator operator++()

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ class small_mapt`
`234`	`234`	`public:`
`235`	`235`	`// Standard const iterator`
`236`	`236`
`237`		`- typedef std::pair<const std::size_t, const T &> value_type;`
	`237`	`+ typedef std::pair<const std::size_t, const T &> valuet;`
`238`	`238`
`239`	`239`	`/// Const iterator`
`240`	`240`	`///`
`@@ -255,14 +255,14 @@ class small_mapt`
`255`	`255`	`{`
`256`	`256`	`}`
`257`	`257`
`258`		`- const value_type operator*() const`
	`258`	`+ const valuet operator*() const`
`259`	`259`	`{`
`260`		`- return value_type(idx, *(m.p + ii));`
	`260`	`+ return valuet(idx, *(m.p + ii));`
`261`	`261`	`}`
`262`	`262`
`263`		`- const std::shared_ptr<value_type> operator->() const`
	`263`	`+ const std::shared_ptr<valuet> operator->() const`
`264`	`264`	`{`
`265`		`- return std::make_shared<value_type>(idx, *(m.p + ii));`
	`265`	`+ return std::make_shared<valuet>(idx, *(m.p + ii));`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`const_iterator operator++()`