Changeset 768b3b4f for src/SynTree

Timestamp:

May 13, 2019, 2:01:20 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

712348a, 9b81fed3

Parents:

b78129a (diff), 336d0b3 (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/SynTree/Declaration.h (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -71 +71 @@
         static Declaration *declFromId( UniqueId id );
 
-  private:
+        UniqueId uniqueId;
         Type::StorageClasses storageClasses;
-        UniqueId uniqueId;
+  private:
 };
 
@@ -213 +213 @@
                 TypeDecl::Kind kind;
                 bool isComplete;
-                
+
                 Data() : kind( (TypeDecl::Kind)-1 ), isComplete( false ) {}
                 Data( TypeDecl * typeDecl ) : Data( typeDecl->get_kind(), typeDecl->isComplete() ) {}
                 Data( Kind kind, bool isComplete ) : kind( kind ), isComplete( isComplete ) {}
-                Data( const Data& d1, const Data& d2 ) 
+                Data( const Data& d1, const Data& d2 )
                 : kind( d1.kind ), isComplete ( d1.isComplete || d2.isComplete ) {}