From a9d8e8bf039f02a970235501978ccd3748f9febe Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Tue, 20 Aug 2013 19:32:07 +0300 Subject: [PATCH] Removed the hard-coded "__" from the CLI back-end. Signed-off-by: Dimitar Dobrev --- src/Generator/Generators/CLI/CLISourcesTemplate.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs index 07f127ec..8f87ae90 100644 --- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs +++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs @@ -740,7 +740,8 @@ namespace CppSharp.Generators.CLI var @params = GenerateFunctionParamsMarshal(function.Parameters, function); if (needsReturn) - Write("auto {0}__ret = ",(function.ReturnType.Type.IsReference())? "&": string.Empty); + Write("auto {0}{1} = ",(function.ReturnType.Type.IsReference())? "&": string.Empty, + Generator.GeneratedIdentifier("ret")); if (!IsNativeFunctionOrStaticMethod(function)) { @@ -799,8 +800,8 @@ namespace CppSharp.Generators.CLI { var ctx = new MarshalContext(Driver) { - ArgName = "__ret", - ReturnVarName = "__ret", + ArgName = Generator.GeneratedIdentifier("ret"), + ReturnVarName = Generator.GeneratedIdentifier("ret"), ReturnType = retType };