Enable compilation with DEBUG defined. Some of the code inside #ifdef DEBUG ... #ENDIF had become stale

Author: andreast271

src/cpp/cpp_instantiate_template.cpp

@@ -465,7 +465,7 @@ const symbolt &cpp_typecheckt::instantiate_template(
 
 #ifdef DEBUG
     std::cout << "instance symbol: " << new_symb.name << "\n\n";
-    std::cout << "template type: " << template_type << "\n\n";
+    std::cout << "template type: " << template_type.pretty() << "\n\n";
 #endif
 
     return new_symb;

src/cpp/cpp_typecheck_compound_type.cpp

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

src/cpp/cpp_typecheck_expr.cpp

@@ -31,6 +31,10 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 #include "cpp_exception_id.h"
 #include "expr2cpp.h"
 
+#ifdef DEBUG
+#include <iostream>
+#endif
+
 bool cpp_typecheckt::find_parent(
   const symbolt &symb,
   const irep_idt &base_name,

src/cpp/cpp_typecheck_resolve.cpp

@@ -11,8 +11,6 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 
 #include "cpp_typecheck_resolve.h"
 
-// #define DEBUG
-
 #ifdef DEBUG
 #include <iostream>
 #endif
@@ -1416,11 +1414,11 @@ exprt cpp_typecheck_resolvet::resolve(
   resolve_scope(cpp_name, base_name, template_args);
 
 #ifdef DEBUG
-  std::cout << "base name: " << base_name << std::endl;
-  std::cout << "template args: " << template_args << std::endl;
-  std::cout << "original-scope: " << original_scope->prefix << std::endl;
+  std::cout << "base name: " << base_name << "\n";
+  std::cout << "template args: " << template_args.pretty() << "\n";
+  std::cout << "original-scope: " << original_scope->prefix << "\n";
   std::cout << "scope: "
-            << cpp_typecheck.cpp_scopes.current_scope().prefix << std::endl;
+            << cpp_typecheck.cpp_scopes.current_scope().prefix << "\n";
 #endif
 
   const source_locationt &source_location=cpp_name.source_location();