diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-10 17:12:53 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-10 21:36:06 -0800 |
commit | 54891e0650e69f08832f75a40dc102efc6115d38 (patch) | |
tree | 0e032a0b337767801f696cbaeacded267c694f32 /src/vm/class.h | |
parent | 396f7d43b3c0f3ca7034a6d1d9cd7d6914778a1e (diff) | |
download | coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.gz coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.bz2 coreclr-54891e0650e69f08832f75a40dc102efc6115d38.zip |
Remove always defined FEATURE_CORECLR
Diffstat (limited to 'src/vm/class.h')
-rw-r--r-- | src/vm/class.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/vm/class.h b/src/vm/class.h index 7517863278..3b7ff4490e 100644 --- a/src/vm/class.h +++ b/src/vm/class.h @@ -1360,9 +1360,6 @@ public: _ASSERTE(HasCriticalTransparentInfo()); return (m_VMFlags & VMFLAG_TRANSPARENCY_MASK) == VMFLAG_TRANSPARENCY_ALLCRITICAL_TAS || (m_VMFlags & VMFLAG_TRANSPARENCY_MASK) == VMFLAG_TRANSPARENCY_TAS_NOTCRITICAL -#ifndef FEATURE_CORECLR - || (m_VMFlags & VMFLAG_TRANSPARENCY_MASK) == VMFLAG_TRANSPARENCY_CRITICAL_TAS -#endif // !FEATURE_CORECLR; ; } @@ -1388,9 +1385,6 @@ public: } void SetCriticalTransparentInfo( -#ifndef FEATURE_CORECLR - BOOL fIsCritical, -#endif // !FEATURE_CORECLR BOOL fIsTreatAsSafe, BOOL fIsAllTransparent, BOOL fIsAllCritical) @@ -1399,9 +1393,7 @@ public: // TAS wihtout critical doesn't make sense - although it was allowed in the v2 desktop model, // so we need to allow it for compatibility reasons on the desktop. -#ifdef FEATURE_CORECLR _ASSERTE(!fIsTreatAsSafe || fIsAllCritical); -#endif // FEATURE_CORECLR //if nothing is set, then we're transparent. unsigned flags = VMFLAG_TRANSPARENCY_TRANSPARENT; @@ -1415,13 +1407,6 @@ public: flags = fIsTreatAsSafe ? VMFLAG_TRANSPARENCY_ALLCRITICAL_TAS : VMFLAG_TRANSPARENCY_ALLCRITICAL; } -#ifndef FEATURE_CORECLR - else if (fIsCritical) - { - flags = fIsTreatAsSafe ? VMFLAG_TRANSPARENCY_CRITICAL_TAS : - VMFLAG_TRANSPARENCY_CRITICAL; - } -#endif // !FEATURE_CORECLR else { flags = fIsTreatAsSafe ? VMFLAG_TRANSPARENCY_TAS_NOTCRITICAL : |