Changes in src/ResolvExpr/CandidateFinder.cpp [c1ed2ee:b69233ac]

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (5 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -39 +39 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
-#include "Common/utility.h"       // for move, copy
 #include "SymTab/Mangler.h"
 #include "SymTab/Validate.h"      // for validateType
@@ -47 +46 @@
 
 namespace ResolvExpr {
+
+using std::move;
+
+/// partner to move that copies any copyable type
+template<typename T>
+T copy( const T & x ) { return x; }
 
 const ast::Expr * referenceToRvalueConversion( const ast::Expr * expr, Cost & cost ) {
@@ -52 +57 @@
                 // cast away reference from expr
                 cost.incReference();
-                return new ast::CastExpr{ expr, expr->result->stripReferences() };
+                return new ast::CastExpr{ expr->location, expr, expr->result->stripReferences() };
         }
         
@@ -121 +126 @@
                         ast::ptr< ast::Type > newType = paramType;
                         env.apply( newType );
-                        return new ast::CastExpr{ arg, newType };
+                        return new ast::CastExpr{ arg->location, arg, newType };
 
                         // xxx - *should* be able to resolve this cast, but at the moment pointers are not 
@@ -788 +793 @@
                         
                         if ( aggrType.as< ast::ReferenceType >() ) {
-                                aggrExpr = new ast::CastExpr{ aggrExpr, aggrType->stripReferences() };
+                                aggrExpr = 
+                                        new ast::CastExpr{ aggrExpr->location, aggrExpr, aggrType->stripReferences() };
                         }