From fd1d3940f329e5fd2f7cd50fc7f61d799f94a961 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 14 Jan 2019 23:24:55 +0000 Subject: [PATCH] Construct complex_typet in a non-deprecated way The default constructor is deprecated. --- src/ansi-c/ansi_c_convert_type.cpp | 3 +-- src/ansi-c/literals/convert_integer_literal.cpp | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ansi-c/ansi_c_convert_type.cpp b/src/ansi-c/ansi_c_convert_type.cpp index ac7b8abdec7..6fe8532ba6d 100644 --- a/src/ansi-c/ansi_c_convert_type.cpp +++ b/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); } diff --git a/src/ansi-c/literals/convert_integer_literal.cpp b/src/ansi-c/literals/convert_integer_literal.cpp index b5c43d8faae..364991becb7 100644 --- a/src/ansi-c/literals/convert_integer_literal.cpp +++ b/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 {