From 972e6257fcde57865197d27bcaac802f7b103c64 Mon Sep 17 00:00:00 2001 From: Stephan Sundermann Date: Wed, 17 Jul 2013 17:07:20 +0200 Subject: [PATCH] generator: removed wrong glue code for structs --- generator/FieldBase.cs | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/generator/FieldBase.cs b/generator/FieldBase.cs index 8e927d601..f42e52eb1 100644 --- a/generator/FieldBase.cs +++ b/generator/FieldBase.cs @@ -176,13 +176,8 @@ namespace GtkSharp.Generation { } else if (Readable && offsetName != null) { sw.WriteLine (indent + "\tget {"); sw.WriteLine (indent + "\t\tunsafe {"); - if (is_struct) { - sw.WriteLine (indent + "\t\t\t" + CSType + "* raw_ptr = (" + CSType + "*)(((byte*)" + container_type.CallByName () + ") + " + offsetName + ");"); - sw.WriteLine (indent + "\t\t\treturn *raw_ptr;"); - } else { - sw.WriteLine (indent + "\t\t\t" + table.GetMarshalType (CType) + "* raw_ptr = (" + table.GetMarshalType (CType) + "*)(((byte*)" + container_type.CallByName () + ") + " + offsetName + ");"); - sw.WriteLine (indent + "\t\t\treturn " + table.FromNative (ctype, "(*raw_ptr)") + ";"); - } + sw.WriteLine (indent + "\t\t\t" + table.GetMarshalType (CType) + "* raw_ptr = (" + table.GetMarshalType (CType) + "*)(((byte*)" + container_type.CallByName () + ") + " + offsetName + ");"); + sw.WriteLine (indent + "\t\t\treturn " + table.FromNative (ctype, "(*raw_ptr)") + ";"); sw.WriteLine (indent + "\t\t}"); sw.WriteLine (indent + "\t}"); } @@ -203,13 +198,8 @@ namespace GtkSharp.Generation { } else if (Writable && offsetName != null) { sw.WriteLine (indent + "\tset {"); sw.WriteLine (indent + "\t\tunsafe {"); - if (is_struct) { - sw.WriteLine (indent + "\t\t\t" + CSType + "* raw_ptr = (" + CSType + "*)(((byte*)" + container_type.CallByName () + ") + " + offsetName + ");"); - sw.WriteLine (indent + "\t\t\t*raw_ptr = value;"); - } else { - sw.WriteLine (indent + "\t\t\t" + table.GetMarshalType (CType) + "* raw_ptr = (" + table.GetMarshalType (CType) + "*)(((byte*)" + container_type.CallByName () + ") + " + offsetName + ");"); - sw.WriteLine (indent + "\t\t\t*raw_ptr = " + to_native + ";"); - } + sw.WriteLine (indent + "\t\t\t" + table.GetMarshalType (CType) + "* raw_ptr = (" + table.GetMarshalType (CType) + "*)(((byte*)" + container_type.CallByName () + ") + " + offsetName + ");"); + sw.WriteLine (indent + "\t\t\t*raw_ptr = " + to_native + ";"); sw.WriteLine (indent + "\t\t}"); sw.WriteLine (indent + "\t}"); }