Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -99,7 +99,7 @@ namespace System.Threading
#endif
currentThread.SetExecutionContext(outerEC, outerECBelongsToScope);
#if DEBUG
#if !MONO && DEBUG
try
{
currentThread.ForbidExecutionContextMutation = true;
@@ -121,7 +121,7 @@ namespace System.Threading
#endif
thread = null; // this will prevent the switcher object being used again
#if DEBUG
#if !MONO && DEBUG
}
finally
{