Changeset b5b0907 for src/SynTree/NamedTypeDecl.cc

Timestamp:

Jun 15, 2015, 12:45:26 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

94b4364

Parents:

ea9b9d3 (diff), a1d5d2a (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc

File:

• src/SynTree/NamedTypeDecl.cc (modified) (4 diffs)

src/SynTree/NamedTypeDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 08:36:09 2015
-// Update Count     : 2
+// Last Modified On : Sat Jun 13 08:13:55 2015
+// Update Count     : 3
 //
 
@@ -18 +18 @@
 #include "utility.h"
 
-NamedTypeDecl::NamedTypeDecl( const std::string &name, StorageClass sc, Type *base )
+NamedTypeDecl::NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *base )
         : Parent( name, sc, LinkageSpec::Cforall ), base( base ) {}
 
@@ -39 +39 @@
                 os << get_name() << ": ";
         } // if
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
         os << typeString();
@@ -63 +63 @@
                 os << get_name() << ": ";
         } // if
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
         os << typeString();