Changeset 8a5bdf0 for src/Parser/DeclarationNode.cc

Timestamp:

Apr 30, 2018, 2:31:18 PM (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, with_gc

Children:

4c80a75

Parents:

5248789 (diff), 5e5dbc2 (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/DeclarationNode.cc (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 20 22:37:20 2018
-// Update Count     : 1063
+// Last Modified On : Thu Apr 26 13:45:10 2018
+// Update Count     : 1064
 //
 
@@ -783 +783 @@
 DeclarationNode * DeclarationNode::addPointer( DeclarationNode * p ) {
         if ( p ) {
-                assert( p->type->kind == TypeData::Pointer || TypeData::Reference );
+                assert( p->type->kind == TypeData::Pointer || p->type->kind == TypeData::Reference );
                 setBase( p->type );
                 p->type = nullptr;