Better template function generation, less manual fixes are needed after generation.

src/Generator/Generators/CLI/CLIHeadersTemplate.cs

@@ -271,9 +271,6 @@ namespace CppSharp.Generators.CLI
 
                 var function = functionTemplate.TemplatedFunction;
 
-                var typeNames = template.Parameters.Select(
-                    param => "typename " + param.Name).ToList();
-
                 var typeCtx = new CLITypePrinterContext()
                     {
                         Kind = TypePrinterContextKind.Template,
@@ -284,10 +281,19 @@ namespace CppSharp.Generators.CLI
 
                 var typePrinter = new CLITypePrinter(Driver, typeCtx);
                 var retType = function.ReturnType.Type.Visit(typePrinter,
-                    function.ReturnType.Qualifiers);
+                    function.ReturnType.Qualifiers).Split('<')[0];
+
+                var typeNamesStr = "";
+                var paramNamesStr = "";
+                var paramNames = template.Parameters.Select(param => param.Name).ToList();
+                if (paramNames.Any())
+                {
+                    typeNamesStr = "typename " + string.Join(", typename ", paramNames);
+                    paramNamesStr = string.Join(", ", paramNames);
+                }
 
-                WriteLine("generic<{0}>", string.Join(", ", typeNames));
+                WriteLine("generic<{0}>", typeNamesStr);
-                WriteLine("{0} {1}({2});", retType, SafeIdentifier(function.Name),
+                WriteLine("{0}<{1}> {2}({3});", retType, paramNamesStr, SafeIdentifier(function.Name),
                     GenerateParametersList(function.Parameters));
             }
             PopIndent();

src/Generator/Generators/CLI/CLISourcesTemplate.cs

@@ -204,9 +204,6 @@ namespace CppSharp.Generators.CLI
 
             var function = template.TemplatedFunction;
 
-            var typeNames = template.Parameters.Select(
-                param => "typename " + param.Name).ToList();
-
             var typeCtx = new CLITypePrinterContext()
                 {
                     Kind = TypePrinterContextKind.Template,
@@ -217,11 +214,20 @@ namespace CppSharp.Generators.CLI
 
             var typePrinter = new CLITypePrinter(Driver, typeCtx);
             var retType = function.ReturnType.Type.Visit(typePrinter,
-                function.ReturnType.Qualifiers);
+                function.ReturnType.Qualifiers).Split('<')[0];
+
+            var typeNamesStr = "";
+            var paramNamesStr = "";
+            var paramNames = template.Parameters.Select(param => param.Name).ToList();
+            if (paramNames.Any())
+            {
+                typeNamesStr = "typename " + string.Join(", typename ", paramNames);
+                paramNamesStr = string.Join(", ", paramNames);
+            }
 
-            WriteLine("generic<{0}>", string.Join(", ", typeNames));
+            WriteLine("generic<{0}>", typeNamesStr);
-            WriteLine("{0} {1}::{2}({3})", retType, QualifiedIdentifier(@class),
+            WriteLine("{0}<{1}> {2}::{3}({4});", retType, paramNamesStr, 
-                      SafeIdentifier(function.Name),
+                QualifiedIdentifier(@class), SafeIdentifier(function.Name),
                 GenerateParametersList(function.Parameters));
 
             WriteStartBraceIndent();