Imported Upstream version 4.0.1

Former-commit-id: 757121caeaad523350be5330f0a3ecc891c70fb8
This commit is contained in:
Jo Shields
2015-04-26 19:10:23 +01:00
parent 7fce50ac98
commit c54b0bda4e
252 changed files with 16715 additions and 1176 deletions

View File

@@ -74,6 +74,7 @@ namespace System.Diagnostics {
if (_initCalled)
return;
#if CONFIGURATION_DEP
SourceElementsCollection sourceElements = DiagnosticsConfiguration.Sources;
if (sourceElements != null) {
@@ -99,6 +100,7 @@ namespace System.Diagnostics {
NoConfigInit();
}
else
#endif
NoConfigInit();
_initCalled = true;
@@ -173,6 +175,7 @@ namespace System.Diagnostics {
return;
}
#if CONFIGURATION_DEP
SourceElementsCollection sources = DiagnosticsConfiguration.Sources;
if (sources != null) {
@@ -233,6 +236,7 @@ namespace System.Diagnostics {
attributes = null;
}
}
#endif
}
[Conditional("TRACE")]