From cbc5f3798629399918fc02c4fef839b0cf070751 Mon Sep 17 00:00:00 2001 From: Jb Evain Date: Thu, 18 Jun 2015 10:56:11 +0200 Subject: Fix order of arguments --- Mono.Cecil/MetadataResolver.cs | 12 ++++++------ .../Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Mono.Cecil/MetadataResolver.cs b/Mono.Cecil/MetadataResolver.cs index 97d3c00..51824fa 100644 --- a/Mono.Cecil/MetadataResolver.cs +++ b/Mono.Cecil/MetadataResolver.cs @@ -246,24 +246,24 @@ namespace Mono.Cecil { for (int i = 0; i < methods.Count; i++) { var method = methods [i]; - if (method.Name != reference.Name) + if (method.HasParameters != reference.HasParameters) continue; + if (!method.HasParameters && !reference.HasParameters) + return method; + if (method.HasGenericParameters != reference.HasGenericParameters) continue; if (method.HasGenericParameters && method.GenericParameters.Count != reference.GenericParameters.Count) continue; - if (!AreSame (method.ReturnType, reference.ReturnType)) + if (method.Name != reference.Name) continue; - if (method.HasParameters != reference.HasParameters) + if (!AreSame (method.ReturnType, reference.ReturnType)) continue; - if (!method.HasParameters && !reference.HasParameters) - return method; - if (!AreSame (method.Parameters, reference.Parameters)) continue; diff --git a/symbols/mdb/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs b/symbols/mdb/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs index cf5d819..0e37c31 100644 --- a/symbols/mdb/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs +++ b/symbols/mdb/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs @@ -205,7 +205,7 @@ namespace Mono.CompilerServices.SymbolWriter public static readonly LineNumberEntry Null = new LineNumberEntry (0, 0, 0, 0); public LineNumberEntry (int file, int row, int column, int offset) - : this (file, row, offset, column, false) + : this (file, row, column, offset, false) { } -- cgit v1.2.3