Merge pull request #7154 from tautschnig/cleanup/remove-deprecated-exprt-methods

Remove deprecated variants of exprt::{add,copy}_to_operands

Author: tautschnig

src/util/expr.h

@@ -10,7 +10,6 @@ Author: Daniel Kroening, [email protected]
 #define CPROVER_UTIL_EXPR_H
 
 #include "as_const.h"
-#include "deprecate.h"
 #include "type.h"
 #include "validate_expressions.h"
 #include "validate_types.h"
@@ -172,29 +171,6 @@ class exprt:public irept
     operands().push_back(std::move(expr));
   }
 
-  /// Copy the given arguments to the end of `exprt`'s operands.
-  /// \param e1: first `exprt` to append to the operands
-  /// \param e2: second `exprt` to append to the operands
-  DEPRECATED(SINCE(2022, 2, 15, "use add_to_operands(&&, &&) instead"))
-  void copy_to_operands(const exprt &e1, const exprt &e2)
-  {
-    operandst &op = operands();
-    #ifndef USE_LIST
-    op.reserve(op.size() + 2);
-    #endif
-    op.push_back(e1);
-    op.push_back(e2);
-  }
-
-  /// Add the given arguments to the end of `exprt`'s operands.
-  /// \param e1: first `exprt` to append to the operands
-  /// \param e2: second `exprt` to append to the operands
-  DEPRECATED(SINCE(2022, 2, 15, "use add_to_operands(&&, &&) instead"))
-  void add_to_operands(const exprt &e1, const exprt &e2)
-  {
-    copy_to_operands(e1, e2);
-  }
-
   /// Add the given arguments to the end of `exprt`'s operands.
   /// \param e1: first `exprt` to append to the operands
   /// \param e2: second `exprt` to append to the operands
@@ -208,32 +184,6 @@ class exprt:public irept
     op.push_back(std::move(e2));
   }
 
-  /// Add the given arguments to the end of `exprt`'s operands.
-  /// \param e1: first `exprt` to append to the operands
-  /// \param e2: second `exprt` to append to the operands
-  /// \param e3: third `exprt` to append to the operands
-  DEPRECATED(SINCE(2022, 2, 15, "use add_to_operands(&&, &&, &&) instead"))
-  void add_to_operands(const exprt &e1, const exprt &e2, const exprt &e3)
-  {
-    copy_to_operands(e1, e2, e3);
-  }
-
-  /// Copy the given arguments to the end of `exprt`'s operands.
-  /// \param e1: first `exprt` to append to the operands
-  /// \param e2: second `exprt` to append to the operands
-  /// \param e3: third `exprt` to append to the operands
-  DEPRECATED(SINCE(2022, 2, 15, "use add_to_operands(&&, &&, &&) instead"))
-  void copy_to_operands(const exprt &e1, const exprt &e2, const exprt &e3)
-  {
-    operandst &op = operands();
-    #ifndef USE_LIST
-    op.reserve(op.size() + 3);
-    #endif
-    op.push_back(e1);
-    op.push_back(e2);
-    op.push_back(e3);
-  }
-
   /// Add the given arguments to the end of `exprt`'s operands.
   /// \param e1: first `exprt` to append to the operands
   /// \param e2: second `exprt` to append to the operands