From bf2dfd375c124baf603ab7b54e77eeb204f27269 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Tue, 20 Aug 2013 18:19:26 +0300 Subject: [PATCH] Fixed the "ret" conflict in the CLI back-end as well. Signed-off-by: Dimitar Dobrev --- src/Generator/Generators/CLI/CLISourcesTemplate.cs | 6 +++--- tests/Basic/Basic.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs index 1a13b35e..07f127ec 100644 --- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs +++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs @@ -740,7 +740,7 @@ 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}__ret = ",(function.ReturnType.Type.IsReference())? "&": string.Empty); if (!IsNativeFunctionOrStaticMethod(function)) { @@ -799,8 +799,8 @@ namespace CppSharp.Generators.CLI { var ctx = new MarshalContext(Driver) { - ArgName = "ret", - ReturnVarName = "ret", + ArgName = "__ret", + ReturnVarName = "__ret", ReturnType = retType }; diff --git a/tests/Basic/Basic.h b/tests/Basic/Basic.h index bf8c2ebd..1639627f 100644 --- a/tests/Basic/Basic.h +++ b/tests/Basic/Basic.h @@ -66,4 +66,4 @@ public: int RetEnum(Enum); }; -int unsafeFunction(const Bar& ret); +int DLL_API unsafeFunction(const Bar& ret);