Browse Source

Fix merge conflict

pull/1165/head
Siegfried Pammer 7 years ago
parent
commit
4c2fa36233
  1. 2
      ICSharpCode.Decompiler/CSharp/CallBuilder.cs

2
ICSharpCode.Decompiler/CSharp/CallBuilder.cs

@ -170,7 +170,7 @@ namespace ICSharpCode.Decompiler.CSharp
arg = arg.ConvertTo(parameter.Type, expressionBuilder, allowImplicitConversion: true); arg = arg.ConvertTo(parameter.Type, expressionBuilder, allowImplicitConversion: true);
if (parameter.IsOut) { if (parameter.IsOut) {
arguments[i] = ExpressionBuilder.ChangeDirectionExpressionToOut(arguments[i]); arg = ExpressionBuilder.ChangeDirectionExpressionToOut(arg);
} }
arguments.Add(arg); arguments.Add(arg);

Loading…
Cancel
Save