2005-05-26 Sebastien Pouliot <sebastien@ximian.com>

	* SynchronizationContext.cs: Updated to beta2 API so it doesn't depend
	on the switcher structure anymore (which will be removed from the
	build).

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

diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog
index 6c577952f512d995bee595193381f89ff964709f..0744e28e4d9c4a2785a11a91a1993847b7b45bf0 100644 (file)
--- a/mcs/class/corlib/System.Threading/ChangeLog
+++ b/mcs/class/corlib/System.Threading/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-26  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * SynchronizationContext.cs: Updated to beta2 API so it doesn't depend
+       on the switcher structure anymore (which will be removed from the 
+       build).
+
 2005-05-24  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Thread.cs: Removed #pragma which aren't supported by CSC 7.x.

diff --git a/mcs/class/corlib/System.Threading/SynchronizationContext.cs b/mcs/class/corlib/System.Threading/SynchronizationContext.cs
index 8dd2260a5a64aefbed83951ed1c797103b573d59..1648adead7352cd44b57c6fa187e26ce1e6e2a9e 100644 (file)
--- a/mcs/class/corlib/System.Threading/SynchronizationContext.cs
+++ b/mcs/class/corlib/System.Threading/SynchronizationContext.cs
@@ -4,9 +4,7 @@
 // Author:
 //   Lluis Sanchez (lluis@novell.com)
 //
-// Copyright (C) Novell, Inc., 2004
-//
-
+// 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
@@ -35,7 +33,6 @@ using System.Runtime.InteropServices;
 
 namespace System.Threading 
 {
-       [ComVisibleAttribute (false)]
        public class SynchronizationContext
        {
                [ThreadStatic]
@@ -59,6 +56,24 @@ namespace System.Threading
                {
                        return new SynchronizationContext (this);
                }
+
+               [MonoTODO]
+               public bool IsWaitNotificationRequired ()
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public virtual void OperationCompleted ()
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public virtual void OperationStarted ()
+               {
+                       throw new NotImplementedException ();
+               }
                
                public virtual void Post (SendOrPostCallback d, object state)
                {
@@ -70,24 +85,20 @@ namespace System.Threading
                        d (state);
                }
                
-               public virtual void SendOrPost (SendOrPostCallback d, object state)
-               {
-                       Send (d, state);
-               }
-
                [MonoTODO]
-               public virtual void SendOrPost (SendOrPostCallback d, object state, ExecutionContext ec)
+               public static void SetSynchronizationContext (SynchronizationContext syncContext)
                {
                        throw new NotImplementedException ();
                }
-               
+
                [MonoTODO]
-               public static SynchronizationContextSwitcher SetSynchronizationContext (SynchronizationContext syncContext)
+               protected void SetWaitNotificationRequired ()
                {
                        throw new NotImplementedException ();
                }
 
                [CLSCompliant (false)]
+               [PrePrepareMethod ()]
                public virtual int Wait (IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout)
                {
                        return WaitHelper (waitHandles, waitAll, millisecondsTimeout);
@@ -96,6 +107,7 @@ namespace System.Threading
                [MonoTODO]
                [CLSCompliant (false)]
                [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
+               [PrePrepareMethod ()]
                protected static int WaitHelper (IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout)
                {
                        throw new NotImplementedException ();