Browse Source

Removed the "protected" modifier of setters when in a structure. Changed a generated local variable to a non-conflicting name.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/46/head
Dimitar Dobrev 13 years ago
parent
commit
712a3904a6
  1. 14
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs

14
src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@ -324,8 +324,8 @@ namespace CppSharp.Generators.CSharp
if (ShouldGenerateClassNativeField(@class)) if (ShouldGenerateClassNativeField(@class))
{ {
PushBlock(CSharpBlockKind.Field); PushBlock(CSharpBlockKind.Field);
WriteLine("public global::System.IntPtr {0} {{ get; protected set; }}", WriteLine("public global::System.IntPtr {0} {{ get; {1} set; }}",
Helpers.InstanceIdentifier); Helpers.InstanceIdentifier, @class.IsValueType ? "private" : "protected");
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
} }
@ -1636,7 +1636,7 @@ namespace CppSharp.Generators.CSharp
Class retClass = null; Class retClass = null;
hiddenParam.Type.Desugar().IsTagDecl(out retClass); hiddenParam.Type.Desugar().IsTagDecl(out retClass);
WriteLine("var ret = new {0}.Internal();", retClass.OriginalName); WriteLine("var __ret = new {0}.Internal();", retClass.OriginalName);
} }
var names = new List<string>(); var names = new List<string>();
@ -1653,7 +1653,7 @@ namespace CppSharp.Generators.CSharp
if (function.HasHiddenStructParameter) if (function.HasHiddenStructParameter)
{ {
var name = string.Format("new IntPtr(&ret)"); var name = string.Format("new IntPtr(&__ret)");
names.Insert(0, name); names.Insert(0, name);
} }
@ -1672,7 +1672,7 @@ namespace CppSharp.Generators.CSharp
} }
if (needsReturn && !function.HasHiddenStructParameter) if (needsReturn && !function.HasHiddenStructParameter)
Write("var ret = "); Write("var __ret = ");
WriteLine("{0}({1});", functionName, string.Join(", ", names)); WriteLine("{0}({1});", functionName, string.Join(", ", names));
@ -1703,8 +1703,8 @@ namespace CppSharp.Generators.CSharp
{ {
var ctx = new CSharpMarshalContext(Driver) var ctx = new CSharpMarshalContext(Driver)
{ {
ArgName = "ret", ArgName = "__ret",
ReturnVarName = "ret", ReturnVarName = "__ret",
ReturnType = retType ReturnType = retType
}; };

Loading…
Cancel
Save