From 3bd0086ac69906aeafc44fb29d9ae7849204f25d Mon Sep 17 00:00:00 2001 From: marcos henrich Date: Tue, 30 Jul 2013 10:58:29 +0100 Subject: [PATCH] Fixed methods generated by FunctionToInstanceMethodPass and FunctionToStaticMethodPass, to use parent class Namespace and keep function Namespace as OriginalNamespace. --- src/Generator/Passes/FunctionToInstanceMethodPass.cs | 1 + src/Generator/Passes/FunctionToStaticMethodPass.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Generator/Passes/FunctionToInstanceMethodPass.cs b/src/Generator/Passes/FunctionToInstanceMethodPass.cs index 3b48a1e2..4810d217 100644 --- a/src/Generator/Passes/FunctionToInstanceMethodPass.cs +++ b/src/Generator/Passes/FunctionToInstanceMethodPass.cs @@ -44,6 +44,7 @@ namespace CppSharp.Passes var method = new Method() { Namespace = @class, + OriginalNamespace = function.Namespace, Name = function.Name, OriginalName = function.OriginalName, Mangled = function.Mangled, diff --git a/src/Generator/Passes/FunctionToStaticMethodPass.cs b/src/Generator/Passes/FunctionToStaticMethodPass.cs index cdc02baf..f7bc833b 100644 --- a/src/Generator/Passes/FunctionToStaticMethodPass.cs +++ b/src/Generator/Passes/FunctionToStaticMethodPass.cs @@ -33,7 +33,8 @@ namespace CppSharp.Passes // Create a new fake method so it acts as a static method. var method = new Method() { - Namespace = @class.Namespace, + Namespace = @class, + OriginalNamespace = function.Namespace, Name = name, OriginalName = function.OriginalName, Mangled = function.Mangled,