Changeset 3d5701e for src/SynTree/DeclarationWithType.cc

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/SynTree/DeclarationWithType.cc (modified) (2 diffs)

src/SynTree/DeclarationWithType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:34:35 2017
-// Update Count     : 25
+// Last Modified On : Fri Dec 13 23:45:16 2019
+// Update Count     : 26
 //
 
@@ -20 +20 @@
 #include "Common/utility.h"      // for cloneAll, deleteAll, maybeClone
 #include "Declaration.h"         // for DeclarationWithType, Declaration
-#include "Parser/LinkageSpec.h"  // for Spec
-#include "SynTree/Expression.h"  // for ConstantExpr
+#include "LinkageSpec.h"         // for Spec
+#include "Expression.h"          // for ConstantExpr
 #include "Type.h"                // for Type, Type::FuncSpecifiers, Type::St...