[Timer] Use static CB for invoking timer callbacks.

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

diff --git a/mcs/class/corlib/System.Threading/Interlocked.cs b/mcs/class/corlib/System.Threading/Interlocked.cs
index 47a9ae19800a830e13c1779ed5ad166e4e55534e..1ca340f7aed086487629ad88b5bf98ed1c58c8eb 100644 (file)
--- a/mcs/class/corlib/System.Threading/Interlocked.cs
+++ b/mcs/class/corlib/System.Threading/Interlocked.cs
@@ -9,7 +9,7 @@
 //
 
 //
-// 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
@@ -33,105 +33,89 @@
 
 using System;
 using System.Runtime.CompilerServices;
-
-#if NET_2_0
+using System.Runtime.InteropServices;
 using System.Runtime.ConstrainedExecution;
-#endif
 
 namespace System.Threading
 {
-       public
-#if NET_2_0
-       static
-#else
-       sealed
-#endif
-       class Interlocked 
+       public static class Interlocked 
        {
 
-#if !NET_2_0
-               private Interlocked () {}
-#endif
-
-#if NET_2_0
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]
-#endif
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static int CompareExchange(ref int location1, int value, int comparand);
 
-#if NET_2_0
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]
-#endif
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static object CompareExchange(ref object location1, object value, object comparand);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static float CompareExchange(ref float location1, float value, float comparand);
 
-#if NET_2_0
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]
-#endif
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static int Decrement(ref int location);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static long Decrement(ref long location);
 
-#if NET_2_0
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]
-#endif
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static int Increment(ref int location);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static long Increment(ref long location);
 
-#if NET_2_0
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]
-#endif
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static int Exchange(ref int location1, int value);
 
-#if NET_2_0
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]
-#endif
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static object Exchange(ref object location1, object value);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static float Exchange(ref float location1, float value);
 
-#if NET_2_0
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static long CompareExchange(ref long location1, long value, long comparand);
 
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static IntPtr CompareExchange(ref IntPtr location1, IntPtr value, IntPtr comparand);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static double CompareExchange(ref double location1, double value, double comparand);
 
+               [ComVisible (false)]
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
+               public extern static T CompareExchange<T> (ref T location1, T value, T comparand) where T:class;
+
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static long Exchange(ref long location1, long value);
 
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static IntPtr Exchange(ref IntPtr location1, IntPtr value);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static double Exchange(ref double location1, double value);
 
+               [ComVisible (false)]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               public extern static long Read(ref long location1);
+               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
+               public extern static T Exchange<T> (ref T location1, T value) where T:class;
 
-               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, CER.Success)]           
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               public extern static int Add(ref int location1, int add);
+               public extern static long Read(ref long location);
 
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]           
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               public extern static long Add(ref long location1, long add);
-#endif
+               public extern static int Add(ref int location1, int value);
+
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]           
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               public extern static long Add(ref long location1, long value);
        }
 }
-