diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-10-12 14:39:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 14:39:43 -0700 |
| commit | 41f083792c77da3ba3b83ce7e5580e9c3287a3ef (patch) | |
| tree | 5c6ac86f92cbb2aed2deecd3248bafab067a67cd /src/vm/mscorlib.h | |
| parent | 983e6cf9f3d06c9a5120ed2aeb382742948382ab (diff) | |
| download | coreclr-41f083792c77da3ba3b83ce7e5580e9c3287a3ef.tar.gz coreclr-41f083792c77da3ba3b83ce7e5580e9c3287a3ef.tar.bz2 coreclr-41f083792c77da3ba3b83ce7e5580e9c3287a3ef.zip | |
Return false from IsMarshalByRefImpl/IsContextfulImpl when remoting is not supported (#7583)
Remove references to types have been moved to corefx in the build
Consolidate FEATURE_CORECLR ifdefs
Diffstat (limited to 'src/vm/mscorlib.h')
| -rw-r--r-- | src/vm/mscorlib.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vm/mscorlib.h b/src/vm/mscorlib.h index 291c6abd47..d728825e1a 100644 --- a/src/vm/mscorlib.h +++ b/src/vm/mscorlib.h @@ -462,8 +462,9 @@ DEFINE_METHOD(CONTEXT, CALLBACK, DoCallBackFromEE, DEFINE_METHOD(CONTEXT, RESERVE_SLOT, ReserveSlot, IM_RetInt) #endif +#ifdef FEATURE_REMOTING DEFINE_CLASS(CONTEXT_BOUND_OBJECT, System, ContextBoundObject) - +#endif #ifdef FEATURE_CRYPTO DEFINE_CLASS(CSP_PARAMETERS, Cryptography, CspParameters) |