Whitespace cleanup, comment type fixed

Author: tautschnig

src/cpp/cpp_constructor.cpp

@@ -42,7 +42,7 @@ codet cpp_typecheckt::cpp_constructor(
   {
     // We allow only one operand and it must be tagged with '#array_ini'.
     // Note that the operand is an array that is used for copy-initialization.
-    // In the general case, a program is not allow to use this form of
+    // In the general case, a program is not allowed to use this form of
     // construct. This way of initializing an array is used internally only.
     // The purpose of the tag #array_ini is to rule out ill-formed
     // programs.

src/cpp/cpp_declarator_converter.cpp

@@ -50,7 +50,6 @@ symbolt &cpp_declarator_convertert::convert(
     typet type;
     type.swap(declarator.name().get_sub().back());
     declarator.type().subtype()=type;
-    std::string tmp;
     cpp_typecheck.typecheck_type(type);
     irept name(ID_name);
     name.set(ID_identifier, "("+cpp_type2name(type)+")");

src/cpp/cpp_instantiate_template.cpp

@@ -227,7 +227,7 @@ const symbolt &cpp_typecheckt::instantiate_template(
   const typet &specialization)
 {
 #ifdef DEBUG
-  std::cout << "instantiate_template: " << template_symbol.name << std::endl;
+  std::cout << "instantiate_template: " << template_symbol.name << '\n';
 #endif
 
   if(instantiation_stack.size()==MAX_DEPTH)
@@ -388,7 +388,7 @@ const symbolt &cpp_typecheckt::instantiate_template(
   }
 
   #ifdef DEBUG
-  std::cout << "CLASS MAP:" << std::endl;
+  std::cout << "CLASS MAP:\n";
   template_map.print(std::cout);
   #endif
 
@@ -447,7 +447,7 @@ const symbolt &cpp_typecheckt::instantiate_template(
       // mapping from template arguments to values/types
       template_map.build(method_type, specialization_template_args);
 #ifdef DEBUG
-      std::cout << "METHOD MAP:" << std::endl;
+      std::cout << "METHOD MAP:\n";
       template_map.print(std::cout);
 #endif
 
@@ -466,8 +466,8 @@ const symbolt &cpp_typecheckt::instantiate_template(
     new_symb.type.set(ID_C_template_arguments, specialization_template_args);
 
 #ifdef DEBUG
-    std::cout << "instance symbol: " << new_symb.name << std::endl << std::endl;
-    std::cout << "template type: " << template_type << std::endl << std::endl;
+    std::cout << "instance symbol: " << new_symb.name << "\n\n";
+    std::cout << "template type: " << template_type << "\n\n";
 #endif
 
     return new_symb;

src/cpp/cpp_typecheck_compound_type.cpp

@@ -890,15 +890,15 @@ void cpp_typecheckt::typecheck_friend_declaration(
   // Do the declarators.
 
 #ifdef DEBUG
-  std::cout << "friend declaration: " << declaration.pretty() << std::endl;
+  std::cout << "friend declaration: " << declaration.pretty() << '\n';
 #endif
 
   for(auto &sub_it : declaration.declarators())
   {
 #ifdef DEBUG
     std::cout << "decl: " << sub_it->pretty() << "\n with value "
-	      << sub_it->value().pretty() << std::endl;
-    std::cout << "  scope: " << cpp_scopes.current_scope().prefix << std::endl;
+	            << sub_it->value().pretty() << '\n';
+    std::cout << "  scope: " << cpp_scopes.current_scope().prefix << '\n';
 #endif
     // In which scope are we going to typecheck this?
 #if 0

src/cpp/cpp_typecheck_resolve.cpp

@@ -511,8 +511,8 @@ void cpp_typecheck_resolvet::disambiguate_functions(
 
       if(it1->type().id()!=ID_code)
       {
-	       identifiers.push_back(*it1);
-	       continue;
+        identifiers.push_back(*it1);
+        continue;
       }
 
       const code_typet &f1=