From e3af3f668e339a215efe94e088f0fb237b6d9988 Mon Sep 17 00:00:00 2001 From: duckdoom5 Date: Thu, 6 Mar 2025 18:04:27 +0100 Subject: [PATCH 1/2] Ignore conflicts with decls that are not generated --- src/Generator/Passes/RenamePass.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Generator/Passes/RenamePass.cs b/src/Generator/Passes/RenamePass.cs index 9dc5778fb..748b3c727 100644 --- a/src/Generator/Passes/RenamePass.cs +++ b/src/Generator/Passes/RenamePass.cs @@ -181,6 +181,8 @@ where typedefDecl.Type.Desugar() is FunctionType declarations.AddRange(@class.TemplateParameters); } + declarations.RemoveAll(d => !d.IsGenerated); + var existing = declarations.Find(d => d != decl && d.Name == newName); if (existing != null) return CheckExisting(decl, existing); From b597250288db5370d5c5d06a4341b811cf8affc4 Mon Sep 17 00:00:00 2001 From: duckdoom5 Date: Sun, 9 Mar 2025 11:49:04 +0100 Subject: [PATCH 2/2] Fix build error in test --- tests/dotnet/Common/Common.Tests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/dotnet/Common/Common.Tests.cs b/tests/dotnet/Common/Common.Tests.cs index 81552884a..3ef6c2441 100644 --- a/tests/dotnet/Common/Common.Tests.cs +++ b/tests/dotnet/Common/Common.Tests.cs @@ -899,7 +899,7 @@ public void TestNonTrivialDtorInvocation() using (var nonTrivialDtor = new NonTrivialDtor()) { } - Assert.IsTrue(NonTrivialDtor.dtorCalled); + Assert.IsTrue(NonTrivialDtor.DtorCalled); } [Test]