Do not use exprt::move_to_operands as it is marked as deprecated

tautschnig · tautschnig · commit 141b5e598cb7 · 2018-10-31T21:44:26.000Z
In particular, the use in std_code.h triggers a series of warnings every time
this file is included.
diff --git a/src/util/expr.cpp b/src/util/expr.cpp
@@ -104,8 +104,7 @@ void exprt::make_not()
   }
   else
   {
-    new_expr=exprt(ID_not, type());
-    new_expr.move_to_operands(*this);
+    new_expr = not_exprt(*this);
   }
 
   swap(new_expr);
diff --git a/src/util/std_code.h b/src/util/std_code.h
@@ -139,7 +139,9 @@ class code_blockt:public codet
 
   void move(codet &code)
   {
-    move_to_operands(code);
+    code_operandst &stmts = statements();
+    stmts.push_back(static_cast<const codet &>(get_nil_irep()));
+    stmts.back().swap(code);
   }
 
   void add(const codet &code)

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,7 @@ void exprt::make_not()`
`104`	`104`	`}`
`105`	`105`	`else`
`106`	`106`	`{`
`107`		`- new_expr=exprt(ID_not, type());`
`108`		`- new_expr.move_to_operands(*this);`
	`107`	`+ new_expr = not_exprt(*this);`
`109`	`108`	`}`
`110`	`109`
`111`	`110`	`swap(new_expr);`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,9 @@ class code_blockt:public codet`
`139`	`139`
`140`	`140`	`void move(codet &code)`
`141`	`141`	`{`
`142`		`- move_to_operands(code);`
	`142`	`+ code_operandst &stmts = statements();`
	`143`	`+ stmts.push_back(static_cast<const codet &>(get_nil_irep()));`
	`144`	`+ stmts.back().swap(code);`
`143`	`145`	`}`
`144`	`146`
`145`	`147`	`void add(const codet &code)`