Changeset f7a4f89 for src/ResolvExpr/AlternativeFinder.h

Timestamp:

Nov 24, 2017, 9:02:40 PM (6 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, resolv-new, with_gc

Children:

cf966b5

Parents:

88ef2af (diff), 3de176d (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/ResolvExpr/AlternativeFinder.h (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.h

@@ -32 +32 @@
 
 namespace ResolvExpr {
-        class ArgPack;
-        
-        /// First index is which argument, second index is which alternative for that argument, 
+        struct ArgPack;
+
+        /// First index is which argument, second index is which alternative for that argument,
         /// third index is which exploded element of that alternative
         using ExplodedArgs = std::vector< std::vector< ExplodedActual > >;
-        
+
         class AlternativeFinder : public Visitor {
           public:
@@ -43 +43 @@
 
                 AlternativeFinder( const AlternativeFinder& o )
-                        : indexer(o.indexer), alternatives(o.alternatives), env(o.env), 
+                        : indexer(o.indexer), alternatives(o.alternatives), env(o.env),
                           targetType(o.targetType) {}
-                
+
                 AlternativeFinder( AlternativeFinder&& o )
-                        : indexer(o.indexer), alternatives(std::move(o.alternatives)), env(o.env), 
+                        : indexer(o.indexer), alternatives(std::move(o.alternatives)), env(o.env),
                           targetType(o.targetType) {}
-                
+
                 AlternativeFinder& operator= ( const AlternativeFinder& o ) {
                         if (&o == this) return *this;
-                        
+
                         // horrific nasty hack to rebind references...
                         alternatives.~AltList();
@@ -61 +61 @@
                 AlternativeFinder& operator= ( AlternativeFinder&& o ) {
                         if (&o == this) return *this;
-                        
+
                         // horrific nasty hack to rebind references...
                         alternatives.~AltList();