Changeset b7d6a36 for src/SynTree/ObjectDecl.cc

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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:

Merge branch 'master' into relaxed_ready

File:

• src/SynTree/ObjectDecl.cc (modified) (3 diffs)

src/SynTree/ObjectDecl.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:27 2017
-// Update Count     : 59
+// Last Modified On : Mon Dec 16 15:12:03 2019
+// Update Count     : 61
 //
 
@@ -23 +23 @@
 #include "Expression.h"          // for Expression
 #include "Initializer.h"         // for Initializer
-#include "Parser/LinkageSpec.h"  // for Spec, linkageName, Cforall
+#include "LinkageSpec.h"         // for Spec, linkageName, Cforall
 #include "Type.h"                // for Type, Type::StorageClasses, Type::Fu...
 
@@ -48 +48 @@
 
         if ( linkage != LinkageSpec::Cforall ) {
-                os << LinkageSpec::linkageName( linkage ) << " ";
+                os << LinkageSpec::name( linkage ) << " ";
         } // if