Changeset f849c8e for src/Tuples/TupleAssignment.h

Timestamp:

Oct 28, 2016, 1:11:12 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

4b1afb6

Parents:

837f999 (diff), 0ebac75 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Makefile.am
src/Makefile.in

File:

• src/Tuples/TupleAssignment.h (modified) (3 diffs)

src/Tuples/TupleAssignment.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TupleAssignment.h -- 
+// TupleAssignment.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -29 +29 @@
           public:
                 // dispatcher for Tuple (multiple and mass) assignment operations
-                TupleAssignSpotter( ResolvExpr::AlternativeFinder * );
+                TupleAssignSpotter( ResolvExpr::AlternativeFinder * = 0 );
                 ~TupleAssignSpotter() { delete matcher; matcher = 0; }
 
@@ -97 +97 @@
                 ResolvExpr::AlternativeFinder *currentFinder;
                 //std::list<Expression *> rhs, lhs;
-                Expression *rhs, *lhs;
+                // Expression *rhs, *lhs;
                 Matcher *matcher;
                 bool hasMatched;