Merge branch 'fsharp' of https://github.com/vosen/dapper-dot-net into vosen-fsharp

Also optimised ldloc/lodloca/stloc and fixed enum double-assignment

Signed-off-by: Marc Gravell <marc.gravell@gmail.com>
This commit is contained in:
Marc Gravell
2012-08-07 11:25:54 +01:00
parent 63d37477b5
commit 00a6e428dc
+3 -3
View File
@@ -1737,7 +1737,7 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
il.Emit(OpCodes.Unbox_Any, unboxType); // stack is now [target][target][typed-value]
if (nullUnderlyingType != null)
{
{
il.Emit(OpCodes.Newobj, memberType.GetConstructor(new[] { nullUnderlyingType })); // stack is now [target][target][enum-value]
}
}
@@ -1750,8 +1750,8 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
{
il.Emit(OpCodes.Unbox_Any, unboxType); // stack is now [target][target][typed-value]
}
}
if (specializedConstructor == null)
}
if (specializedConstructor == null)
{
// Store the value in the property/field
if (item.Property != null)