From dae633b89f02448941c8674d1a0667eb7db20826 Mon Sep 17 00:00:00 2001
From: triton <ripzonetriton@gmail.com>
Date: Sun, 20 Jan 2013 13:47:57 +0000
Subject: [PATCH] Improved CLI value class marshaling.

---
 src/Generator/Generators/CLI/CLIMarshal.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Generator/Generators/CLI/CLIMarshal.cs b/src/Generator/Generators/CLI/CLIMarshal.cs
index 92f31394..df3aae95 100644
--- a/src/Generator/Generators/CLI/CLIMarshal.cs
+++ b/src/Generator/Generators/CLI/CLIMarshal.cs
@@ -131,8 +131,16 @@ namespace Cxxi.Generators.CLI
 
         public bool VisitClassDecl(Class @class)
         {
-            Return = string.Format("gcnew {0}({1})", @class.Name, Context.ReturnVarName);
-            return @class.IsValueType;
+            if (@class.IsRefType)
+                Return = "gcnew ";
+
+            Return += string.Format("{0}(", @class.Name);
+
+            if (@class.IsValueType && !this.Context.ReturnType.IsPointer())
+                Return += "&";
+
+            Return += string.Format("{0})", this.Context.ReturnVarName);
+            return true;
         }
 
         public bool VisitFieldDecl(Field field)