Changes in src/ResolvExpr/Resolver.cc [d57e349:2773ab8]

File:

• src/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -957 +957 @@
                         }
                 };
-        } // anonymous namespace
-
-        /// Check if this expression is or includes a deleted expression
-        const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
-                ast::Pass<DeleteFinder_new> finder;
-                expr->accept( finder );
-                return finder.pass.delExpr;
-        }
-
-        namespace {
+
+                /// Check if this expression is or includes a deleted expression
+                const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
+                        ast::Pass<DeleteFinder_new> finder;
+                        expr->accept( finder );
+                        return finder.pass.delExpr;
+                }
+
                 /// always-accept candidate filter
                 bool anyCandidate( const Candidate & ) { return true; }
@@ -1026 +1024 @@
 
                         // promote candidate.cvtCost to .cost
-                        promoteCvtCost( winners );
+                        for ( CandidateRef & cand : winners ) {
+                                cand->cost = cand->cvtCost;
+                        }
 
                         // produce ambiguous errors, if applicable