Changeset 610194e for src/Parser/TypedefTable.cc

Timestamp:

Jul 13, 2018, 11:36:05 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

2e02851

Parents:

825170d (diff), 79caea8 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/TypedefTable.cc (modified) (2 diffs)

src/Parser/TypedefTable.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypedefTable.cc -- 
+// TypedefTable.cc --
 //
 // Author           : Peter A. Buhr
@@ -100 +100 @@
 void TypedefTable::up( bool forall ) {
         level += 1;
-        kindTable.getNote( kindTable.currentScope() ) = (Note){ level, forall | getEnclForall() };
+        kindTable.getNote( kindTable.currentScope() ) = (Note){ level, static_cast<bool>(forall | getEnclForall()) };
         debugPrint( cerr << "Up " << " level " << level << " note " << kindTable.getNote( level ).level << ", " << kindTable.getNote( level ).forall << endl; );
 } // TypedefTable::up