Wrapped pointers to primitives as such.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>

src/Generator/Generators/CLI/CLIMarshal.cs

@@ -76,7 +76,7 @@ namespace CppSharp.Generators.CLI
 
             if (pointee.IsPrimitiveType(PrimitiveType.Void))
             {
-                Context.Return.Write("IntPtr({0})", Context.ReturnVarName);
+                Context.Return.Write(Context.ReturnVarName);
                 return true;
             }
 
@@ -89,7 +89,7 @@ namespace CppSharp.Generators.CLI
 
             if (pointee.IsPrimitiveType(out primitive))
             {
-                Context.Return.Write("IntPtr({0})", Context.ReturnVarName);
+                Context.Return.Write(Context.ReturnVarName);
                 return true;
             }
 
@@ -431,7 +431,7 @@ namespace CppSharp.Generators.CLI
                 var cppTypeName = pointer.Visit(cppTypePrinter, quals);
 
                 Context.Return.Write("({0})", cppTypeName);
-                Context.Return.Write("{0}.ToPointer()", Context.Parameter.Name);
+                Context.Return.Write(Context.Parameter.Name);
                 return true;
             }
 

src/Generator/Generators/CLI/CLITypePrinter.cs

@@ -148,7 +148,7 @@ namespace CppSharp.Generators.CLI
                 if (param != null && (param.IsOut || param.IsInOut))
                     return VisitPrimitiveType(primitive);
 
-                return "System::IntPtr";
+                return VisitPrimitiveType(primitive, quals) + "*";
             }
 
             return pointee.Visit(this, quals);

src/Generator/Generators/CSharp/CSharpTypePrinter.cs

@@ -203,9 +203,6 @@ namespace CppSharp.Generators.CSharp
                 if (ContextKind == CSharpTypePrinterContextKind.GenericDelegate)
                     return "global::System.IntPtr";
 
-                if (primitive == PrimitiveType.Void)
-                    return "global::System.IntPtr";
-
                 return VisitPrimitiveType(primitive, quals) + "*";
             }