Utility functions cont. (to be squashed)

Author: svorenova

src/java_bytecode/java_types.h

@@ -512,13 +512,12 @@ class java_generic_symbol_typet : public symbol_typet
   /// in the vector of generic types.
   /// \param type The type we are looking for.
   /// \return The index of the type in the vector of generic types.
-  optionalt<size_t> generic_type(const reference_typet &type) const
+  optionalt<size_t> generic_type_index(const reference_typet &type) const
   {
-    const size_t &index =
-      std::find(generic_types().begin(), generic_types().end(), type) -
-      generic_types().begin();
-    if(index < generic_types().size())
-      return index;
+    const auto &type_pointer =
+      std::find(generic_types().begin(), generic_types().end(), type);
+    if(type_pointer != generic_types().end())
+      return type_pointer - generic_types().begin();
     return {};
   }
 };

src/util/std_types.h

@@ -410,7 +410,7 @@ class class_typet:public struct_typet
     {
       for(const auto &b : bases())
       {
-        if(to_symbol_type(b.type()).get(ID_identifier) == id)
+        if(to_symbol_type(b.type()).get_identifier() == id)
           return b;
       }
     }