Merge remote branch 'tgiphil/master'; commit 'c9bc218cd3ccfa17532a'

[mono.git] / mcs / class / corlib / System.Threading / HostExecutionContextManager.cs

diff --git a/mcs/class/corlib/System.Threading/HostExecutionContextManager.cs b/mcs/class/corlib/System.Threading/HostExecutionContextManager.cs
index 8580db57bf656ef8c4cb1e7beaa4b96ef3e6c268..7d979b6cc60a7fa0bac4f9266470166c37c283b2 100644 (file)
--- a/mcs/class/corlib/System.Threading/HostExecutionContextManager.cs
+++ b/mcs/class/corlib/System.Threading/HostExecutionContextManager.cs
@@ -4,7 +4,7 @@
 // Author:
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -26,14 +26,11 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
+using System.Security.Permissions;
 using System.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
 
 namespace System.Threading {
 
-       [ComVisible (false)]
        public class HostExecutionContextManager {
 
                public HostExecutionContextManager ()
@@ -47,18 +44,18 @@ namespace System.Threading {
                }
 
                [MonoTODO]
-               [ReliabilityContract (Consistency.WillNotCorruptState, CER.MayFail)]
-               public virtual void Revert (HostExecutionContextSwitcher hostContextSwitcher)
+               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
+               public virtual void Revert (object previousState)
                {
                        throw new NotImplementedException ();
                }
 
                [MonoTODO]
-               public virtual HostExecutionContextSwitcher SetHostExecutionContext (HostExecutionContext hostExecutionContext)
+               [SecurityPermission (SecurityAction.LinkDemand, Infrastructure = true)]
+               public virtual object SetHostExecutionContext (HostExecutionContext hostExecutionContext)
                {
                        throw new NotImplementedException ();
                }
        }
 }
 
-#endif