Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@ -192,9 +192,14 @@ namespace System.Threading
[MethodImplAttribute(MethodImplOptions.InternalCall)]
extern static void try_enter_with_atomic_var (object obj, int millisecondsTimeout, ref bool lockTaken);
[MethodImplAttribute(MethodImplOptions.InternalCall)]
extern static void enter_with_atomic_var (object obj, ref bool lockTaken);
// Can't make this an icall since it has the same name as the other Enter method
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void Enter (object obj, ref bool lockTaken)
{
TryEnter (obj, Timeout.Infinite, ref lockTaken);
enter_with_atomic_var (obj, ref lockTaken);
}
public static void TryEnter (object obj, ref bool lockTaken)