From: Marek Safar <marek.safar@gmail.com>
Date: Sun, 24 Jun 2012 15:45:24 +0000 (-0700)
Subject: Merge pull request #347 from JamesB7/master
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=3d43cfdfccc1aa699e599c39f91fb41231304da9;hp=18817d92759926a4b5bdb8460d9eed5877db6a63;p=mono.git

Merge pull request #347 from JamesB7/master

.NET 4.5 .cctor crash fix for ComIStreamMarshaler
---

diff --git a/mcs/class/System.Drawing/System.Drawing/ComIStreamMarshaler.cs b/mcs/class/System.Drawing/System.Drawing/ComIStreamMarshaler.cs
index 1abe9afd2af..5064cae15d4 100644
--- a/mcs/class/System.Drawing/System.Drawing/ComIStreamMarshaler.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ComIStreamMarshaler.cs
@@ -105,7 +105,7 @@ namespace System.Drawing
 
 			private static readonly Guid IID_IUnknown = new Guid("00000000-0000-0000-C000-000000000046");
 			private static readonly Guid IID_IStream = new Guid("0000000C-0000-0000-C000-000000000046");
-			private static readonly MethodInfo exceptionGetHResult = typeof(Exception).GetProperty("HResult", BindingFlags.GetProperty | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.ExactBinding, null, typeof(int), new Type[] {}, null).GetGetMethod(true);
+			private static readonly MethodInfo exceptionGetHResult = typeof(Exception).GetProperty("HResult", BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.ExactBinding, null, typeof(int), new Type[] {}, null).GetGetMethod(true);
 			// Keeps delegates alive while they are marshaled
 			private static readonly IStreamVtbl managedVtable;
 			private static IntPtr comVtable;