diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-12 10:54:14 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-12 16:55:37 -0800 |
| commit | c9850c6172e09fe824e02a6f2e7eb6c4863952d5 (patch) | |
| tree | e6feb8c6af216cbfebf3fb64eca1d482ab51977c /src/binder/clrprivbindercoreclr.cpp | |
| parent | 9c93286cb13d9f50f1f25cdcbcbc3719a178b374 (diff) | |
| download | coreclr-c9850c6172e09fe824e02a6f2e7eb6c4863952d5.tar.gz coreclr-c9850c6172e09fe824e02a6f2e7eb6c4863952d5.tar.bz2 coreclr-c9850c6172e09fe824e02a6f2e7eb6c4863952d5.zip | |
Remove always defined FEATURE_HOST_ASSEMBLY_RESOLVER
Diffstat (limited to 'src/binder/clrprivbindercoreclr.cpp')
| -rw-r--r-- | src/binder/clrprivbindercoreclr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/binder/clrprivbindercoreclr.cpp b/src/binder/clrprivbindercoreclr.cpp index d62af867ef..b7a6807520 100644 --- a/src/binder/clrprivbindercoreclr.cpp +++ b/src/binder/clrprivbindercoreclr.cpp @@ -62,7 +62,7 @@ HRESULT CLRPrivBinderCoreCLR::BindAssemblyByName(IAssemblyName *pIAssemblyNa hr = BindAssemblyByNameWorker(pAssemblyName, &pCoreCLRFoundAssembly, false /* excludeAppPaths */); -#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) +#if !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) if ((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == FUSION_E_APP_DOMAIN_LOCKED) || (hr == FUSION_E_REF_DEF_MISMATCH)) { @@ -94,7 +94,7 @@ HRESULT CLRPrivBinderCoreCLR::BindAssemblyByName(IAssemblyName *pIAssemblyNa } } } -#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) +#endif // !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) IF_FAIL_GO(hr); @@ -107,7 +107,7 @@ Exit:; return hr; } -#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) +#if !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) HRESULT CLRPrivBinderCoreCLR::BindUsingPEImage( /* in */ PEImage *pPEImage, /* in */ BOOL fIsNativeImage, /* [retval][out] */ ICLRPrivAssembly **ppAssembly) @@ -179,7 +179,7 @@ Exit:; return hr; } -#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) +#endif // !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) HRESULT CLRPrivBinderCoreCLR::VerifyBind(IAssemblyName *AssemblyName, ICLRPrivAssembly *pAssembly, |