Changeset c28afead for src/Common/Debug.h

Timestamp:

Apr 19, 2018, 6:11:07 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

8633f060

Parents:

9dc31c10 (diff), 60ba456 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflict

File:

• src/Common/Debug.h (modified) (1 diff)

src/Common/Debug.h

@@ -37 +37 @@
 
                 std::cerr << "======" << label << "======" << std::endl;
-                CodeGen::generate( decls, std::cerr, true, true );
+                CodeGen::generate(
+                        decls,
+                        std::cerr,
+                        true /* doIntrinsics */,
+                        true /* pretty */,
+                        false /* generateC */,
+                        false /* lineMarks */,
+                        true /* printTypeExpr */
+                );
         #endif
         } // dump