Changeset f80e0218 for src/ResolvExpr/ConversionCost.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 'master' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/ResolvExpr/ConversionCost.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ConversionCost.cc -- 
+// ConversionCost.cc --
 //
 // Author           : Richard C. Bilson
@@ -157 +157 @@
                                 cost = Cost( 0, 0, tableResult );
                         } // if
-                } // if
+                } else if ( dynamic_cast< EnumInstType *>( dest ) ) {
+                        // xxx - not positive this is correct, but appears to allow casting int => enum
+                        cost = Cost( 1, 0, 0 );
+    } // if
         }