From 03f59982563e2f31da8784d490c34ddc49f8bea7 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Mon, 10 Feb 2014 17:48:24 -0500 Subject: [PATCH] Fixed CopyClassFields helper to prefer complete declarations. --- src/Generator/Library.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Generator/Library.cs b/src/Generator/Library.cs index 903c25df..9177ae08 100644 --- a/src/Generator/Library.cs +++ b/src/Generator/Library.cs @@ -229,15 +229,12 @@ namespace CppSharp public static void CopyClassFields(this ASTContext context, string source, string destination) { - foreach (var @class in context.FindClass(source)) - { - foreach (var dest in context.FindClass(destination)) - { - dest.Fields.AddRange(@class.Fields); - foreach (var field in dest.Fields) - field.Namespace = dest; - } - } + var @class = context.FindCompleteClass(source); + var dest = context.FindCompleteClass(destination); + + dest.Fields.AddRange(@class.Fields); + foreach (var field in dest.Fields) + field.Namespace = dest; } #endregion