Merge pull request #3892 from diffblue/type_with_subtypest-constructor

tautschnig · web-flow · commit 502d7e69711c · 2019-01-22T17:18:04.000Z
avoid using deprecated constructor of type_with_subtypest
diff --git a/src/ansi-c/merged_type.h b/src/ansi-c/merged_type.h
@@ -15,7 +15,7 @@ Author: Daniel Kroening, kroening@kroening.com
 class merged_typet : public type_with_subtypest
 {
 public:
-  merged_typet() : type_with_subtypest(ID_merged_type)
+  merged_typet() : type_with_subtypest(ID_merged_type, {})
   {
   }
 
diff --git a/src/util/mathematical_types.h b/src/util/mathematical_types.h
@@ -63,11 +63,10 @@ class mathematical_function_typet : public type_with_subtypest
   using domaint = std::vector<typet>;
 
   mathematical_function_typet(const domaint &_domain, const typet &_codomain)
-    : type_with_subtypest(ID_mathematical_function)
+    : type_with_subtypest(
+        ID_mathematical_function,
+        {type_with_subtypest(irep_idt(), _domain), _codomain})
   {
-    subtypes().resize(2);
-    domain() = _domain;
-    codomain() = _codomain;
   }
 
   domaint &domain()

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ Author: Daniel Kroening, [email protected]`
`15`	`15`	`class merged_typet : public type_with_subtypest`
`16`	`16`	`{`
`17`	`17`	`public:`
`18`		`- merged_typet() : type_with_subtypest(ID_merged_type)`
	`18`	`+ merged_typet() : type_with_subtypest(ID_merged_type, {})`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,10 @@ class mathematical_function_typet : public type_with_subtypest`
`63`	`63`	`using domaint = std::vector<typet>;`
`64`	`64`
`65`	`65`	`mathematical_function_typet(const domaint &_domain, const typet &_codomain)`
`66`		`- : type_with_subtypest(ID_mathematical_function)`
	`66`	`+ : type_with_subtypest(`
	`67`	`+ ID_mathematical_function,`
	`68`	`+ {type_with_subtypest(irep_idt(), _domain), _codomain})`
`67`	`69`	`{`
`68`		`- subtypes().resize(2);`
`69`		`- domain() = _domain;`
`70`		`- codomain() = _codomain;`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`domaint &domain()`