Changeset d60ccbf for src/SymTab/TypeEquality.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 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:

f32c7f4

Parents:

e45215c (diff), e869d663 (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 designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

• src/SymTab/TypeEquality.cc (modified) (2 diffs)

src/SymTab/TypeEquality.cc

@@ -10 +10 @@
 // Created On       : Tue Jul 07 16:28:29 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jul 09 11:18:46 2015
-// Update Count     : 36
+// Last Modified On : Mon Jul 20 14:16:11 2015
+// Update Count     : 37
 //
 
@@ -91 +91 @@
                         // and must both have a dimension expression or not have a dimension
                         result = result && arrayType->get_isVarLen() == at->get_isVarLen()
-                                && (arrayType->get_dimension() != 0 && at->get_dimension() != 0
-                                        || arrayType->get_dimension() == 0 && at->get_dimension() == 0);
+                                && ((arrayType->get_dimension() != 0 && at->get_dimension() != 0)
+                                        || (arrayType->get_dimension() == 0 && at->get_dimension() == 0));
 
                         if ( vlaErr ) {