2009-06-10 Marek Safar <marek.safar@gmail.com>

	* LockRecursionException.cs: Updated to 4.0 changes.

svn path=/trunk/mcs/; revision=135853

diff --git a/mcs/class/System.Core/System.Threading/ChangeLog b/mcs/class/System.Core/System.Threading/ChangeLog
index 90f25389dc2e146a40d4e5a80cd49c7a820189b0..700ea999fbd76f7d3b48ff1bda247549e6bd37c1 100644 (file)
--- a/mcs/class/System.Core/System.Threading/ChangeLog
+++ b/mcs/class/System.Core/System.Threading/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-10  Marek Safar  <marek.safar@gmail.com>
+
+       * LockRecursionException.cs: Updated to 4.0 changes.
+
 2009-01-18  Marek Safar <marek.safar@gmail.com>
 
        * ReaderWriterLockSlim.cs: Implemented all properties.

diff --git a/mcs/class/System.Core/System.Threading/LockRecursionException.cs b/mcs/class/System.Core/System.Threading/LockRecursionException.cs
index 7fa88d4f443987135e2477a3db1b102a887d8b89..974f7373bde7c647459b53f90ee895ff7d5d35f5 100644 (file)
--- a/mcs/class/System.Core/System.Threading/LockRecursionException.cs
+++ b/mcs/class/System.Core/System.Threading/LockRecursionException.cs
@@ -24,6 +24,14 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#if NET_4_0
+
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly:TypeForwardedTo (typeof(System.Threading.LockRecursionException))]
+
+#else
 
 using System;
 using System.Runtime.Serialization;
@@ -54,3 +62,5 @@ namespace System.Threading
                }
        }
 }
+
+#endif