From c4713ea4a01468b3a7f602d2989bbc13689c7610 Mon Sep 17 00:00:00 2001 From: Jb Evain Date: Tue, 6 Apr 2010 16:19:21 +0000 Subject: [PATCH] 2010-04-06 Jb Evain * SemaphoreFullException.cs: moved to corlib in net_4_0. svn path=/trunk/mcs/; revision=154866 --- mcs/class/System/System.Threading/ChangeLog | 4 ++++ mcs/class/System/System.Threading/SemaphoreFullException.cs | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mcs/class/System/System.Threading/ChangeLog b/mcs/class/System/System.Threading/ChangeLog index 4c3c189c188..08e84cbd049 100644 --- a/mcs/class/System/System.Threading/ChangeLog +++ b/mcs/class/System/System.Threading/ChangeLog @@ -1,3 +1,7 @@ +2010-04-06 Jb Evain + + * SemaphoreFullException.cs: moved to corlib in net_4_0. + 2010-03-02 Jérémie Laval * Barrier.cs: Remove dead comments diff --git a/mcs/class/System/System.Threading/SemaphoreFullException.cs b/mcs/class/System/System.Threading/SemaphoreFullException.cs index bb06d1023b5..ef4a7f946c3 100644 --- a/mcs/class/System/System.Threading/SemaphoreFullException.cs +++ b/mcs/class/System/System.Threading/SemaphoreFullException.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 || (NET_4_0 && INSIDE_CORLIB) +#if (!NET_4_0 && NET_2_0 && !INSIDE_CORLIB) || (NET_4_0 && INSIDE_CORLIB) using System.Runtime.InteropServices; using System.Runtime.Serialization; @@ -35,7 +35,7 @@ using System.Runtime.CompilerServices; namespace System.Threading { #if NET_4_0 && INSIDE_CORLIB -// [TypeForwardedFrom (Consts.AssemblySystem_2_0)] + [TypeForwardedFrom (Consts.AssemblySystem_2_0)] #endif [ComVisible (false)] [Serializable] @@ -61,6 +61,11 @@ namespace System.Threading { { } } + } +#elif NET_4_0 && !INSIDE_CORLIB +using System.Runtime.CompilerServices; +using System.Threading; +[assembly: TypeForwardedTo (typeof (SemaphoreFullException))] #endif -- 2.11.4.GIT