Merge pull request #4243 from tautschnig/irep-deprecated-cleanup

Remove deprecated irept::get_unsigned_int

Author: tautschnig

src/util/expr.h

@@ -9,6 +9,7 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_UTIL_EXPR_H
 #define CPROVER_UTIL_EXPR_H
 
+#include "deprecate.h"
 #include "type.h"
 #include "validate_expressions.h"
 #include "validate_types.h"

src/util/irep.cpp

@@ -109,11 +109,6 @@ int irept::get_int(const irep_namet &name) const
   return unsafe_string2int(get_string(name));
 }
 
-unsigned int irept::get_unsigned_int(const irep_namet &name) const
-{
-  return unsafe_string2unsigned(get_string(name));
-}
-
 std::size_t irept::get_size_t(const irep_namet &name) const
 {
   return unsafe_string2size_t(get_string(name));

src/util/irep.h

@@ -13,7 +13,6 @@ Author: Daniel Kroening, [email protected]
 #include <string>
 #include <vector>
 
-#include "deprecate.h"
 #include "invariant.h"
 #include "irep_ids.h"
 
@@ -208,7 +207,6 @@ class sharing_treet
   {
     if(data!=&empty_d)
     {
-      // NOLINTNEXTLINE(build/deprecated)
       PRECONDITION(data->ref_count != 0);
       data->ref_count++;
 #ifdef IREP_DEBUG
@@ -433,9 +431,6 @@ class irept
   const irep_idt &get(const irep_namet &name) const;
   bool get_bool(const irep_namet &name) const;
   signed int get_int(const irep_namet &name) const;
-  /// \deprecated use get_size_t instead
-  DEPRECATED("Use get_size_t instead")
-  unsigned int get_unsigned_int(const irep_namet &name) const;
   std::size_t get_size_t(const irep_namet &name) const;
   long long get_long_long(const irep_namet &name) const;
 

src/util/message.h

@@ -15,6 +15,7 @@ Author: Daniel Kroening, [email protected]
 #include <sstream>
 #include <string>
 
+#include "deprecate.h"
 #include "invariant.h"
 #include "json.h"
 #include "source_location.h"

src/util/type.h

@@ -15,6 +15,7 @@ Author: Daniel Kroening, [email protected]
 
 class namespacet;
 
+#include "deprecate.h"
 #include "source_location.h"
 #include "validate_types.h"
 #include "validation_mode.h"