Changeset 1f44196 for src/ResolvExpr/Alternative.h

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 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:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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/Parser/parser.cc

File:

• src/ResolvExpr/Alternative.h (modified) (3 diffs)

src/ResolvExpr/Alternative.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Alternative.h -- 
+// Alternative.h --
 //
 // Author           : Richard C. Bilson
@@ -12 +12 @@
 // Last Modified On : Sat May 16 23:54:39 2015
 // Update Count     : 2
-// 
+//
 
 #ifndef ALTERNATIVE_H
@@ -32 +32 @@
                 Alternative( const Alternative &other );
                 Alternative &operator=( const Alternative &other );
+                Alternative( Alternative && other );
+                Alternative &operator=( Alternative && other );
                 ~Alternative();
-  
+
                 void initialize( const Alternative &src, Alternative &dest );
-  
+
                 void print( std::ostream &os, int indent = 0 ) const;
-  
+
                 Cost cost;
                 Cost cvtCost;