Use decay instead of remove_const(remove_reference)

reuk · reuk · commit bc3d79baddc4 · 2017-10-05T15:10:08.000+01:00
diff --git a/src/util/expr_cast.h b/src/util/expr_cast.h
@@ -84,7 +84,7 @@ expr_try_dynamic_cast(const exprt &base)
   return detail::expr_try_dynamic_cast<
     T,
     typename std::remove_reference<T>::type,
-    typename std::remove_const<typename std::remove_reference<T>::type>::type,
+    typename std::decay<T>::type,
     const exprt>(base);
 }
 
@@ -101,7 +101,7 @@ expr_try_dynamic_cast(exprt &base)
   return detail::expr_try_dynamic_cast<
     T,
     typename std::remove_reference<T>::type,
-    typename std::remove_const<typename std::remove_reference<T>::type>::type,
+    typename std::decay<T>::type,
     exprt>(base);
 }
 
@@ -155,7 +155,7 @@ T expr_dynamic_cast(const exprt &base)
 {
   return detail::expr_dynamic_cast<
     T,
-    typename std::remove_const<typename std::remove_reference<T>::type>::type,
+    typename std::decay<T>::type,
     const exprt>(base);
 }
 
@@ -171,7 +171,7 @@ T expr_dynamic_cast(exprt &base)
 {
   return detail::expr_dynamic_cast<
     T,
-    typename std::remove_const<typename std::remove_reference<T>::type>::type,
+    typename std::decay<T>::type,
     exprt>(base);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ expr_try_dynamic_cast(const exprt &base)`
`84`	`84`	`return detail::expr_try_dynamic_cast<`
`85`	`85`	`T,`
`86`	`86`	`typename std::remove_reference<T>::type,`
`87`		`- typename std::remove_const<typename std::remove_reference<T>::type>::type,`
	`87`	`+ typename std::decay<T>::type,`
`88`	`88`	`const exprt>(base);`
`89`	`89`	`}`
`90`	`90`
`@@ -101,7 +101,7 @@ expr_try_dynamic_cast(exprt &base)`
`101`	`101`	`return detail::expr_try_dynamic_cast<`
`102`	`102`	`T,`
`103`	`103`	`typename std::remove_reference<T>::type,`
`104`		`- typename std::remove_const<typename std::remove_reference<T>::type>::type,`
	`104`	`+ typename std::decay<T>::type,`
`105`	`105`	`exprt>(base);`
`106`	`106`	`}`
`107`	`107`
`@@ -155,7 +155,7 @@ T expr_dynamic_cast(const exprt &base)`
`155`	`155`	`{`
`156`	`156`	`return detail::expr_dynamic_cast<`
`157`	`157`	`T,`
`158`		`- typename std::remove_const<typename std::remove_reference<T>::type>::type,`
	`158`	`+ typename std::decay<T>::type,`
`159`	`159`	`const exprt>(base);`
`160`	`160`	`}`
`161`	`161`
`@@ -171,7 +171,7 @@ T expr_dynamic_cast(exprt &base)`
`171`	`171`	`{`
`172`	`172`	`return detail::expr_dynamic_cast<`
`173`	`173`	`T,`
`174`		`- typename std::remove_const<typename std::remove_reference<T>::type>::type,`
	`174`	`+ typename std::decay<T>::type,`
`175`	`175`	`exprt>(base);`
`176`	`176`	`}`
`177`	`177`