Changeset 3d5701e for src/SynTree/FunctionDecl.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/FunctionDecl.cc (modified) (3 diffs)

src/SynTree/FunctionDecl.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:33:41 2017
-// Update Count     : 74
+// Last Modified On : Mon Dec 16 15:11:20 2019
+// Update Count     : 77
 //
 
@@ -23 +23 @@
 #include "Common/utility.h"      // for maybeClone, printAll
 #include "Declaration.h"         // for FunctionDecl, FunctionDecl::Parent
-#include "Parser/LinkageSpec.h"  // for Spec, linkageName, Cforall
+#include "Expression.h"
+#include "LinkageSpec.h"         // for Spec, linkageName, Cforall
 #include "Statement.h"           // for CompoundStmt
 #include "Type.h"                // for Type, FunctionType, Type::FuncSpecif...
@@ -72 +73 @@
         } // if
         if ( linkage != LinkageSpec::Cforall ) {
-                os << LinkageSpec::linkageName( linkage ) << " ";
+                os << LinkageSpec::name( linkage ) << " ";
         } // if