Changes in src/ResolvExpr/Alternative.cc [bd4f2e9:4e7cc5ce]

File:

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

src/ResolvExpr/Alternative.cc

@@ -27 +27 @@
 
 namespace ResolvExpr {
-        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( 0 ) {}
+        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ) {}
 
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
@@ -48 +48 @@
         }
 
-        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( other.env ) {
+        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( std::move( other.env ) ) {
                 other.expr = nullptr;
         }
@@ -58 +58 @@
                 cvtCost = other.cvtCost;
                 expr = other.expr;
-                env = other.env;
+                env = std::move( other.env );
                 other.expr = nullptr;
                 return *this;