Changeset 95b8aa7 for src/ResolvExpr/ConversionCost.cc

Timestamp:

Jan 11, 2019, 3:36:48 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

e1f7eef

Parents:

ff5caaf (diff), 52ffa30 (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:

Pull fixes for deferred_resn from other branch

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,  0,  0 };
-        const Cost Cost::infinity =  Cost{ -1, -1, -1,  1, -1, -1 };
+        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::safe =      Cost{  0,  0,  1,  0,  0,  0 };
+        const Cost Cost::var =       Cost{  0,  0,  0,  1,  0,  0 };
+        const Cost Cost::spec =      Cost{  0,  0,  0,  0, -1,  0 };
         const Cost Cost::reference = Cost{  0,  0,  0,  0,  0,  1 };