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/ilmarshalers.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/ilmarshalers.h')
-rw-r--r-- | src/vm/ilmarshalers.h | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/src/vm/ilmarshalers.h b/src/vm/ilmarshalers.h index 5337b081c6..7c7f9a6553 100644 --- a/src/vm/ilmarshalers.h +++ b/src/vm/ilmarshalers.h @@ -600,7 +600,7 @@ public: nativeSize = wNativeSize; } -#if defined(_TARGET_X86_) || (defined(_TARGET_AMD64_) && defined(_WIN64) && !defined(FEATURE_CORECLR)) +#if defined(_TARGET_X86_) // JIT32 and JIT64 (which is only used on the Windows Desktop CLR) has a problem generating // code for the pinvoke ILStubs which do a return using a struct type. Therefore, we // change the signature of calli to return void and make the return buffer as first argument. @@ -2716,42 +2716,6 @@ protected: }; -#ifndef FEATURE_CORECLR -class ILBlittableValueClassWithCopyCtorMarshaler : public ILMarshaler -{ -public: - enum - { - c_fInOnly = TRUE, - c_nativeSize = VARIABLESIZE, - c_CLRSize = sizeof(OBJECTREF), - }; - - LocalDesc GetManagedType() - { - LIMITED_METHOD_CONTRACT; - return LocalDesc(); - } - - LocalDesc GetNativeType() - { - LIMITED_METHOD_CONTRACT; - return LocalDesc(); - } - - static MarshalerOverrideStatus ArgumentOverride(NDirectStubLinker* psl, - BOOL byref, - BOOL fin, - BOOL fout, - BOOL fManagedToNative, - OverrideProcArgs* pargs, - UINT* pResID, - UINT argidx, - UINT nativeStackOffset); - - -}; -#endif // !FEATURE_CORECLR class ILArgIteratorMarshaler : public ILMarshaler |