Misc review requests

Author: NathanJPhillips

src/cpp/cpp_typecheck_compound_type.cpp

@@ -536,7 +536,7 @@ void cpp_typecheckt::typecheck_compound_declarator(
         vt_symb_type.type.set(ID_name, vt_symb_type.name);
         vt_symb_type.is_type=true;
 
-        bool failed=!symbol_table.insert(std::move(vt_symb_type));
+        const bool failed=!symbol_table.insert(std::move(vt_symb_type));
         assert(!failed);
 
         // add a virtual-table pointer
@@ -612,7 +612,7 @@ void cpp_typecheckt::typecheck_compound_declarator(
           arg.set(ID_C_identifier, arg_symb.name);
 
           // add the parameter to the symbol table
-          bool failed=!symbol_table.insert(std::move(arg_symb));
+          const bool failed=!symbol_table.insert(std::move(arg_symb));
           assert(!failed);
         }
 

src/java_bytecode/java_utils.cpp

@@ -86,7 +86,8 @@ void generate_class_stub(
   new_symbol.mode=ID_java;
   new_symbol.is_type=true;
 
-  auto res=symbol_table.insert(std::move(new_symbol));
+  optionalt<std::reference_wrapper<symbolt>> res=
+    symbol_table.insert(std::move(new_symbol));
 
   if(!res)
   {

src/util/symbol_table.cpp

@@ -115,7 +115,8 @@ void symbol_tablet::erase(const symbolst::const_iterator &entry)
   const symbolt &symbol=entry->second;
 
   symbol_base_mapt::const_iterator
-    base_it=symbol_base_map.lower_bound(entry->second.base_name),
+    base_it=symbol_base_map.lower_bound(entry->second.base_name);
+  symbol_base_mapt::const_iterator
     base_it_end=symbol_base_map.upper_bound(entry->second.base_name);
   while(base_it!=base_it_end && base_it->second!=symbol.name)
     ++base_it;