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/rexcep.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/rexcep.h')
| -rw-r--r-- | src/vm/rexcep.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vm/rexcep.h b/src/vm/rexcep.h index fe920bcd2d..1d1d9385f0 100644 --- a/src/vm/rexcep.h +++ b/src/vm/rexcep.h @@ -144,7 +144,11 @@ DEFINE_EXCEPTION(g_SystemNS, BadImageFormatException, true, DEFINE_EXCEPTION(g_SystemNS, CannotUnloadAppDomainException, false, COR_E_CANNOTUNLOADAPPDOMAIN) DEFINE_EXCEPTION(g_CodeContractsNS, ContractException, false, COR_E_CODECONTRACTFAILED) + +#ifdef FEATURE_REMOTING DEFINE_EXCEPTION(g_SystemNS, ContextMarshalException, false, COR_E_CONTEXTMARSHAL) +#endif + DEFINE_EXCEPTION(g_ReflectionNS, CustomAttributeFormatException, false, COR_E_CUSTOMATTRIBUTEFORMAT) #if defined(FEATURE_X509) || defined(FEATURE_CRYPTO) |