Merge pull request #4460 from tautschnig/constructor-fix

tautschnig · web-flow · commit d46024942347 · 2019-03-30T12:35:38.000Z
Ensure typet constructor is always compatible with GCC 5's STL [blocks: #4458]
diff --git a/src/util/type.h b/src/util/type.h
@@ -32,10 +32,17 @@ class typet:public irept
 
   explicit typet(const irep_idt &_id):irept(_id) { }
 
+#if defined(__clang__) || !defined(__GNUC__) || __GNUC__ >= 6
   typet(irep_idt _id, typet _subtype)
     : irept(std::move(_id), {}, {std::move(_subtype)})
   {
   }
+#else
+  typet(irep_idt _id, typet _subtype) : irept(std::move(_id))
+  {
+    subtype() = std::move(_subtype);
+  }
+#endif
 
   const typet &subtype() const
   {

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,17 @@ class typet:public irept`
`32`	`32`
`33`	`33`	`explicit typet(const irep_idt &_id):irept(_id) { }`
`34`	`34`
	`35`	`+#if defined(__clang__) \|\| !defined(__GNUC__) \|\| __GNUC__ >= 6`
`35`	`36`	`typet(irep_idt _id, typet _subtype)`
`36`	`37`	`: irept(std::move(_id), {}, {std::move(_subtype)})`
`37`	`38`	`{`
`38`	`39`	`}`
	`40`	`+#else`
	`41`	`+ typet(irep_idt _id, typet _subtype) : irept(std::move(_id))`
	`42`	`+ {`
	`43`	`+ subtype() = std::move(_subtype);`
	`44`	`+ }`
	`45`	`+#endif`
`39`	`46`
`40`	`47`	`const typet &subtype() const`
`41`	`48`	`{`