Changeset 2a301ff for src/GenPoly/SpecializeNew.cpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• src/GenPoly/SpecializeNew.cpp (modified) (2 diffs)

src/GenPoly/SpecializeNew.cpp

@@ -104 +104 @@
 
 bool needsPolySpecialization(
-                const ast::Type * formalType,
+                const ast::Type * /*formalType*/,
                 const ast::Type * actualType,
                 const ast::TypeSubstitution * subs ) {
@@ -126 +126 @@
                         if ( closedVars.find( *inst ) == closedVars.end() ) {
                                 return true;
-                        }
-                        else {
+                        } else {
                                 assertf(false, "closed: %s", inst->name.c_str());
                         }