Fixed the generated C# for public fields with type a dependent function pointer.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator/Generators/CSharp/CSharpMarshal.cs

@@ -270,13 +270,18 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)
             var functionType = decl.Type as FunctionType;
             if (functionType != null || decl.Type.IsPointerTo(out functionType))
             {
-                var ptrName = Generator.GeneratedIdentifier("ptr") +
-                    Context.ParameterIndex;
-
-                Context.Before.WriteLine("var {0} = {1};", ptrName,
-                    Context.ReturnVarName);
-
-                var res = $"{ptrName} == IntPtr.Zero? null : ({typedef})Marshal.GetDelegateForFunctionPointer({ptrName}, typeof({typedef}))";
+                var ptrName = $"{Generator.GeneratedIdentifier("ptr")}{Context.ParameterIndex}";
+
+                Context.Before.WriteLine($"var {ptrName} = {Context.ReturnVarName};");
+
+                var specialization = decl.Namespace as ClassTemplateSpecialization;
+                var res = string.Format(
+                    "{0} == IntPtr.Zero? null : {1}({2}) Marshal.GetDelegateForFunctionPointer({0}, typeof({2}))",
+                    ptrName,
+                    specialization == null ? string.Empty :
+                        $@"({specialization.TemplatedDecl.TemplatedClass.Typedefs.First(
+                            t => t.Name == decl.Name).Visit(this.typePrinter)}) (object) ",
+                    typedef);
                 Context.Return.Write(res);
                 return true;
             }

tests/CSharp/CSharpTemplates.h

@@ -137,6 +137,8 @@ class DLL_API DependentValueFields : public Base<T>
     T getDependentValue();
     void setDependentValue(const T& value);
     IndependentFields<Nested> returnNestedInTemplate();
+    typedef void (*DependentFunctionPointer)(T);
+    DependentFunctionPointer dependentFunctionPointerField;
 private:
     T field{};
     union {