Changeset 3d5701e for src/CodeGen/FixMain.h

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• src/CodeGen/FixMain.h (modified) (3 diffs)

src/CodeGen/FixMain.h

@@ -10 +10 @@
 // Created On       : Thr Jan 12 14:11:09 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:16:59 2017
-// Update Count     : 1
+// Last Modified On : Sun Feb 16 03:24:32 2020
+// Update Count     : 5
 //
 
@@ -19 +19 @@
 #include <memory>
 
-#include "Parser/LinkageSpec.h"
+#include "SynTree/LinkageSpec.h"
 
 class FunctionDecl;
@@ -42 +42 @@
                 static std::unique_ptr<FunctionDecl> main_signature;
         };
-};
+} // namespace CodeGen