Merge pull request #3903 from tautschnig/deprecation-complex_typet

Construct complex_typet in a non-deprecated way [blocks: #3800]

Author: tautschnig

src/ansi-c/ansi_c_convert_type.cpp

@@ -599,9 +599,8 @@ void ansi_c_convert_typet::write(typet &type)
   if(complex_cnt)
   {
     // These take more or less arbitrary subtypes.
-    complex_typet new_type;
+    complex_typet new_type(type);
     new_type.add_source_location()=source_location;
-    new_type.subtype()=type;
     type.swap(new_type);
   }
 

src/ansi-c/literals/convert_integer_literal.cpp

@@ -173,10 +173,8 @@ exprt convert_integer_literal(const std::string &src)
 
   if(is_imaginary)
   {
-    complex_typet complex_type;
-    complex_type.subtype()=type;
     result = complex_exprt(
-      from_integer(0, type), from_integer(value, type), complex_type);
+      from_integer(0, type), from_integer(value, type), complex_typet(type));
   }
   else
   {