From e0a618128732dc88a50975812b356e4c2cadc660 Mon Sep 17 00:00:00 2001 From: triton Date: Sat, 18 May 2013 15:41:07 +0100 Subject: [PATCH] Make sure we skip ignored overloads when checking for ambiguous overloads. --- src/Generator/Passes/CheckAmbiguousOverloads.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Generator/Passes/CheckAmbiguousOverloads.cs b/src/Generator/Passes/CheckAmbiguousOverloads.cs index 4ed89efe..9a8aa0f5 100644 --- a/src/Generator/Passes/CheckAmbiguousOverloads.cs +++ b/src/Generator/Passes/CheckAmbiguousOverloads.cs @@ -98,6 +98,9 @@ namespace CppSharp.Passes if (visited.Contains(function)) return false; + if (function.Ignore) + return false; + var overloads = AST.Utils.GetFunctionOverloads(function, currentClass); var signatures = overloads.Select(fn => new OverloadSignature(fn)).ToList(); @@ -105,8 +108,14 @@ namespace CppSharp.Passes { visited.Add(sig1.Function); + if (sig1.Function.Ignore) + continue; + foreach (var sig2 in signatures) { + if (sig2.Function.Ignore) + continue; + if (!OverloadSignature.IsAmbiguous(sig1, sig2, currentClass)) continue;