diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-01-14 03:27:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 03:27:13 +0300 |
| commit | f6f266d36ed0f8ffb8d8ea384e2059877eedf32b (patch) | |
| tree | 8189911e13fdb66e65dc46264a76d5cfa69938ba | |
| parent | 90354c614dee967f002097d4e8780efcdc1a5559 (diff) | |
| parent | 7eee7431ece5603b201f2c9c1ac5b64a58ca4834 (diff) | |
Merge pull request #2507 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/Native/Runtime/gcrhenv.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Native/Runtime/gcrhenv.cpp b/src/Native/Runtime/gcrhenv.cpp index c60f09f0a..2dfb7fcf1 100644 --- a/src/Native/Runtime/gcrhenv.cpp +++ b/src/Native/Runtime/gcrhenv.cpp @@ -1597,7 +1597,7 @@ void CPUGroupInfo::GetGroupForProcessor(uint16_t /*processor_number*/, uint16_t ASSERT_UNCONDITIONALLY("NYI: CPUGroupInfo::GetGroupForProcessor"); } -#ifdef FEATURE_EVENT_TRACE +#if defined(FEATURE_EVENT_TRACE) && !defined(DACCESS_COMPILE) ProfilingScanContext::ProfilingScanContext(BOOL fProfilerPinnedParam) : ScanContext() { @@ -1609,4 +1609,4 @@ ProfilingScanContext::ProfilingScanContext(BOOL fProfilerPinnedParam) promotion = g_pConfig->GetGCConservative(); #endif } -#endif // FEATURE_EVENT_TRACE +#endif // defined(FEATURE_EVENT_TRACE) && !defined(DACCESS_COMPILE) |