Changeset 97397a26 for src/ResolvExpr/ConversionCost.cc

Timestamp:

Jun 29, 2018, 3:41:39 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

b21c77a

Parents:

982f95d (diff), b60f9d9 (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 'with_gc' into new-env

File:

• src/ResolvExpr/ConversionCost.cc (modified) (1 diff)

src/ResolvExpr/ConversionCost.cc

@@ -29 +29 @@
 
 namespace ResolvExpr {
-        const Cost Cost::zero =      Cost(  0,  0,  0,  0 );
-        const Cost Cost::infinity =  Cost( -1, -1, -1, -1 );
-        const Cost Cost::unsafe =    Cost(  1,  0,  0,  0 );
-        const Cost Cost::poly =      Cost(  0,  1,  0,  0 );
-        const Cost Cost::safe =      Cost(  0,  0,  1,  0 );
-        const Cost Cost::reference = Cost(  0,  0,  0,  1 );
+        const Cost Cost::zero =      Cost{  0,  0,  0,  0,  0,  0 };
+        const Cost Cost::infinity =  Cost{ -1, -1, -1,  1, -1, -1 };
+        const Cost Cost::unsafe =    Cost{  1,  0,  0,  0,  0,  0 };
+        const Cost Cost::poly =      Cost{  0,  1,  0,  0,  0,  0 };
+        const Cost Cost::var =       Cost{  0,  0,  1,  0,  0,  0 };
+        const Cost Cost::spec =      Cost{  0,  0,  0, -1,  0,  0 };
+        const Cost Cost::safe =      Cost{  0,  0,  0,  0,  1,  0 };
+        const Cost Cost::reference = Cost{  0,  0,  0,  0,  0,  1 };
 
 #if 0