Changeset f841241 for src/Parser/TypeData.h

Timestamp:

Mar 15, 2017, 11:23:48 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

9243cc91, ecc7752

Parents:

3831b58 (diff), e61a35e (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/TypeData.h (modified) (2 diffs)

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  8 22:28:33 2017
-// Update Count     : 174
+// Last Modified On : Tue Mar 14 16:51:26 2017
+// Update Count     : 181
 //
 
 #ifndef TYPEDATA_H
 #define TYPEDATA_H
-
-#include <bitset>
 
 #include "ParseNode.h"
@@ -77 +75 @@
         DeclarationNode::BuiltinType builtintype = DeclarationNode::NoBuiltinType;
 
-        typedef std::bitset< DeclarationNode::NoTypeQualifier > TypeQualifiers;
-        TypeQualifiers typeQualifiers;
+        DeclarationNode::TypeQualifiers typeQualifiers;
         DeclarationNode * forall;