diff options
| author |  Rustan Leino <unknown> | 2014-07-08 15:28:19 -0700 |
|---|---|---|
| committer | Rustan Leino <unknown> | 2014-07-08 15:28:19 -0700 |
| commit | e114841f66691bd534bafc9b12d993fb246e375b (patch) | |
| tree | a91b6bf9a152c2a0aad3f942e94dca4738f363bf /Source/Dafny/Resolver.cs | |
| parent | f0b0ac64dc1d45e87c4eec869991ed86d8439f7f (diff) | |
Further resolved merge conflicts
Diffstat (limited to 'Source/Dafny/Resolver.cs')
| -rw-r--r-- | Source/Dafny/Resolver.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Dafny/Resolver.cs b/Source/Dafny/Resolver.cs index f78bc81d..19d3025f 100644 --- a/Source/Dafny/Resolver.cs +++ b/Source/Dafny/Resolver.cs @@ -6204,7 +6204,7 @@ namespace Microsoft.Dafny } else if (expr is ConversionExpr) {
var e = (ConversionExpr)expr;
- ResolveType(e.tok, e.ToType, ResolveTypeOption.DontInfer, null);
+ ResolveType(e.tok, e.ToType, new ResolveTypeOption(ResolveTypeOptionEnum.DontInfer), null);
ResolveExpression(e.E, twoState, codeContext);
if (e.ToType is IntType) {
if (!(e.E.Type is RealType)) {
|