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/comcallablewrapper.cpp | |
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/comcallablewrapper.cpp')
-rw-r--r-- | src/vm/comcallablewrapper.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/vm/comcallablewrapper.cpp b/src/vm/comcallablewrapper.cpp index 17f0fb60aa..91e9afcda3 100644 --- a/src/vm/comcallablewrapper.cpp +++ b/src/vm/comcallablewrapper.cpp @@ -1774,12 +1774,10 @@ IUnknown* SimpleComCallWrapper::QIStandardInterface(Enum_StdInterfaces index) else if (index == enum_IDispatchEx) { -#ifdef FEATURE_CORECLR if (AppX::IsAppXProcess()) { RETURN NULL; } -#endif // FEATURE_CORECLR if (SupportsIReflect(m_pMT)) { @@ -1988,9 +1986,6 @@ IUnknown* SimpleComCallWrapper::QIStandardInterface(REFIID riid) // Keeping the Apollo behaviour also ensures that we allow SL 8.1 scenarios (which do not pass the AppX flag like the modern host) // to use CorDispatcher for async, in the expected manner, as the OS implementation for CoreDispatcher expects objects to be Agile. if (!IsAggregated() -#if !defined(FEATURE_CORECLR) - && AppX::IsAppXProcess() -#endif // !defined(FEATURE_CORECLR) ) { ComCallWrapperTemplate *pTemplate = GetComCallWrapperTemplate(); @@ -3614,12 +3609,10 @@ IUnknown* ComCallWrapper::GetComIPFromCCW(ComCallWrapper *pWrap, REFIID riid, Me } if (IsIDispatch(riid)) { -#ifdef FEATURE_CORECLR if (AppX::IsAppXProcess()) { RETURN NULL; } -#endif // FEATURE_CORECLR // We don't do visibility checks on IUnknown. RETURN pWrap->GetIDispatchIP(); @@ -4735,11 +4728,6 @@ BOOL ComMethodTable::LayOutInterfaceMethodTable(MethodTable* pClsMT) SLOT *pComVtable; unsigned i; -#ifndef FEATURE_CORECLR - // Skip this unnecessary expensive check for CoreCLR - if (!CheckSigTypesCanBeLoaded(pItfClass)) - return FALSE; -#endif LOG((LF_INTEROP, LL_INFO1000, "LayOutInterfaceMethodTable: %s, this: %p\n", pItfClass->GetDebugClassName(), this)); |