use std::size_t for container indices

Author: kroening

src/analyses/escape_analysis.cpp

@@ -319,7 +319,7 @@ bool escape_domaint::merge(
   {
     const std::set<irep_idt> &b_cleanup=cleanup.second.cleanup_functions;
     std::set<irep_idt> &a_cleanup=cleanup_map[cleanup.first].cleanup_functions;
-    unsigned old_size=a_cleanup.size();
+    auto old_size=a_cleanup.size();
     a_cleanup.insert(b_cleanup.begin(), b_cleanup.end());
     if(a_cleanup.size()!=old_size)
       changed=true;
@@ -379,7 +379,7 @@ void escape_domaint::check_lhs(
     {
       // count the aliases
 
-      unsigned count=0;
+      std::size_t count=0;
 
       for(const auto &alias : aliases)
       {

src/analyses/goto_check.cpp

@@ -572,7 +572,7 @@ void goto_checkt::integer_overflow_check(
     // The overflow checks are binary!
     // We break these up.
 
-    for(unsigned i=1; i<expr.operands().size(); i++)
+    for(std::size_t i=1; i<expr.operands().size(); i++)
     {
       exprt tmp;
 

src/analyses/invariant_set.cpp

@@ -27,7 +27,7 @@ Author: Daniel Kroening, [email protected]
 
 void inv_object_storet::output(std::ostream &out) const
 {
-  for(unsigned i=0; i<entries.size(); i++)
+  for(std::size_t i=0; i<entries.size(); i++)
     out << "STORE " << i << ": " << to_string(i, "") << '\n';
 }
 
@@ -61,7 +61,7 @@ unsigned inv_object_storet::add(const exprt &expr)
 
   assert(s!="");
 
-  unsigned n=map.number(s);
+  mapt::number_type n=map.number(s);
 
   if(n>=entries.size())
   {
@@ -188,11 +188,11 @@ void invariant_sett::add(
   unsigned f_r=eq_set.find(p.first);
   unsigned s_r=eq_set.find(p.second);
 
-  for(unsigned f=0; f<eq_set.size(); f++)
+  for(std::size_t f=0; f<eq_set.size(); f++)
   {
     if(eq_set.find(f)==f_r)
     {
-      for(unsigned s=0; s<eq_set.size(); s++)
+      for(std::size_t s=0; s<eq_set.size(); s++)
         if(eq_set.find(s)==s_r)
           dest.insert(std::pair<unsigned, unsigned>(f, s));
     }
@@ -209,7 +209,7 @@ void invariant_sett::add_eq(const std::pair<unsigned, unsigned> &p)
   bool constant_seen=false;
   mp_integer c;
 
-  for(unsigned i=0; i<eq_set.size(); i++)
+  for(std::size_t i=0; i<eq_set.size(); i++)
   {
     if(eq_set.find(i)==r)
     {
@@ -319,12 +319,12 @@ void invariant_sett::output(
   INVARIANT_STRUCTURED(
     object_store!=nullptr, nullptr_exceptiont, "Object store is null");
 
-  for(unsigned i=0; i<eq_set.size(); i++)
+  for(std::size_t i=0; i<eq_set.size(); i++)
     if(eq_set.is_root(i) &&
        eq_set.count(i)>=2)
     {
       bool first=true;
-      for(unsigned j=0; j<eq_set.size(); j++)
+      for(std::size_t j=0; j<eq_set.size(); j++)
         if(eq_set.find(j)==i)
         {
           if(first)
@@ -367,7 +367,7 @@ void invariant_sett::add_type_bounds(const exprt &expr, const typet &type)
 
   if(type.id()==ID_unsignedbv)
   {
-    unsigned op_width=to_unsignedbv_type(type).get_width();
+    std::size_t op_width=to_unsignedbv_type(type).get_width();
 
     if(op_width<=8)
     {
@@ -852,7 +852,7 @@ exprt invariant_sett::get_constant(const exprt &expr) const
     unsigned r=eq_set.find(a);
 
     // is it a constant?
-    for(unsigned i=0; i<eq_set.size(); i++)
+    for(std::size_t i=0; i<eq_set.size(); i++)
       if(eq_set.find(i)==r)
       {
         const exprt &e=object_store->get_expr(i);
@@ -938,8 +938,8 @@ bool invariant_sett::make_union(const invariant_sett &other)
   eq_set.intersection(other.eq_set);
 
   // inequalities
-  unsigned old_ne_set=ne_set.size();
-  unsigned old_le_set=le_set.size();
+  std::size_t old_ne_set=ne_set.size();
+  std::size_t old_le_set=le_set.size();
 
   intersection(ne_set, other.ne_set);
   intersection(le_set, other.le_set);

src/analyses/uninitialized_domain.cpp

@@ -81,7 +81,7 @@ bool uninitialized_domaint::merge(
   locationt from,
   locationt to)
 {
-  unsigned old_uninitialized=uninitialized.size();
+  auto old_uninitialized=uninitialized.size();
 
   uninitialized.insert(
     other.uninitialized.begin(),

src/ansi-c/c_typecheck_code.cpp

@@ -151,7 +151,7 @@ void c_typecheck_baset::typecheck_asm(codet &code)
 
     typecheck_expr(code.op0());
 
-    for(unsigned i=1; i<code.operands().size(); i++)
+    for(std::size_t i=1; i<code.operands().size(); i++)
     {
       exprt &list=code.operands()[i];
       Forall_operands(it, list)

src/ansi-c/c_typecheck_expr.cpp

@@ -2646,7 +2646,7 @@ void c_typecheck_baset::typecheck_function_call_arguments(
     throw 0;
   }
 
-  for(unsigned i=0; i<arguments.size(); i++)
+  for(std::size_t i=0; i<arguments.size(); i++)
   {
     exprt &op=arguments[i];
 

src/cpp/cpp_declarator_converter.cpp

@@ -252,7 +252,7 @@ void cpp_declarator_convertert::combine_types(
     if(decl_code_type.return_type()==symbol_code_type.return_type() &&
        decl_code_type.parameters().size()==symbol_code_type.parameters().size())
     {
-      for(unsigned i=0; i<decl_code_type.parameters().size(); i++)
+      for(std::size_t i=0; i<decl_code_type.parameters().size(); i++)
       {
         const code_typet::parametert &decl_parameter=
           decl_code_type.parameters()[i];

src/cpp/cpp_exception_id.cpp

@@ -78,7 +78,7 @@ irept cpp_exception_list(
   cpp_exception_list_rec(src, ns, "", ids);
   result.get_sub().resize(ids.size());
 
-  for(unsigned i=0; i<ids.size(); i++)
+  for(std::size_t i=0; i<ids.size(); i++)
     result.get_sub()[i].id(ids[i]);
 
   return result;

src/cpp/cpp_instantiate_template.cpp

@@ -415,13 +415,13 @@ const symbolt &cpp_typecheckt::instantiate_template(
       static_cast<const exprt &>(
         template_symbol.value.find("template_methods"));
 
-    for(unsigned i=0; i<template_methods.operands().size(); i++)
+    for(auto &tm : template_methods.operands())
     {
       cpp_saved_scope.restore();
 
       cpp_declarationt method_decl=
         static_cast<const cpp_declarationt &>(
-          static_cast<const irept &>(template_methods.operands()[i]));
+          static_cast<const irept &>(tm));
 
       // copy the type of the template method
       template_typet method_type=

src/cpp/cpp_internal_additions.cpp

@@ -20,7 +20,7 @@ std::string c2cpp(const std::string &s)
 
   result.reserve(s.size());
 
-  for(unsigned i=0; i<s.size(); i++)
+  for(std::size_t i=0; i<s.size(); i++)
   {
     char ch=s[i];