summaryrefslogtreecommitdiff
path: root/src/vm/pefile.h
diff options
context:
space:
mode:
authorJan Vorlicek <janvorli@microsoft.com>2016-05-07 10:47:59 +0200
committerJan Vorlicek <janvorli@microsoft.com>2016-05-07 10:47:59 +0200
commit29fcfe2938e3890cd6fb302d2f8c6dabc1a09fc4 (patch)
tree6d78c357065c39e7bed9f86178b9af47944aaefd /src/vm/pefile.h
parent0ef1fc9aa3d65d41b5b9c8cd4911a1f8cdece049 (diff)
downloadcoreclr-29fcfe2938e3890cd6fb302d2f8c6dabc1a09fc4.tar.gz
coreclr-29fcfe2938e3890cd6fb302d2f8c6dabc1a09fc4.tar.bz2
coreclr-29fcfe2938e3890cd6fb302d2f8c6dabc1a09fc4.zip
Remove FEATURE_HOSTED_BINDER definition (#4838)
The FEATURE_HOSTED_BINDER is always on so remove it from all the sources.
Diffstat (limited to 'src/vm/pefile.h')
-rw-r--r--src/vm/pefile.h22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/vm/pefile.h b/src/vm/pefile.h
index 5cf5dfb937..5cefd5d2bd 100644
--- a/src/vm/pefile.h
+++ b/src/vm/pefile.h
@@ -40,9 +40,7 @@
#include "corperm.h"
#include "eventtrace.h"
-#ifdef FEATURE_HOSTED_BINDER
#include "clrprivbinderutil.h"
-#endif
// --------------------------------------------------------------------------------
// Forward declared classes
@@ -643,7 +641,6 @@ public:
{
LIMITED_METHOD_CONTRACT;
-#ifdef FEATURE_HOSTED_BINDER
DWORD binderFlags = BINDER_NONE;
HRESULT hr = E_FAIL;
@@ -651,9 +648,6 @@ public:
hr = GetHostAssembly()->GetBinderFlags(&binderFlags);
return hr == S_OK ? binderFlags & BINDER_DESIGNER_BINDING_CONTEXT : FALSE;
-#else
- return FALSE;
-#endif
}
LPCWSTR GetPathForErrorMessages();
@@ -662,12 +656,9 @@ public:
void MarkNativeImageInvalidIfOwned();
void ConvertMetadataToRWForEnC();
-#if defined(FEATURE_VERSIONING) || defined(FEATURE_HOSTED_BINDER)
protected:
PTR_ICLRPrivAssembly m_pHostAssembly;
-#endif
-#ifdef FEATURE_HOSTED_BINDER
protected:
friend class CLRPrivBinderFusion;
@@ -693,7 +684,6 @@ public:
bool CanUseWithBindingCache()
{ LIMITED_METHOD_CONTRACT; return !HasHostAssembly(); }
-#endif // FEATURE_HOSTED_BINDER
}; // class PEFile
@@ -712,7 +702,6 @@ class PEAssembly : public PEFile
// Public API
// ------------------------------------------------------------
-#if defined(FEATURE_HOSTED_BINDER)
#if !defined(FEATURE_CORECLR)
static PEAssembly * Open(
PEAssembly * pParentAssembly,
@@ -734,7 +723,6 @@ class PEAssembly : public PEFile
ICLRPrivAssembly * pHostAssembly,
BOOL fIsIntrospectionOnly = FALSE);
#endif //!FEATURE_CORECLR
-#endif //FEATURE_HOSTED_BINDER
// This opens the canonical mscorlib.dll
#ifdef FEATURE_FUSION
@@ -981,13 +969,10 @@ class PEAssembly : public PEFile
IMetaDataEmit *pEmit,
PEFile *creator,
BOOL system,
- BOOL introspectionOnly = FALSE
-#ifdef FEATURE_HOSTED_BINDER
- ,
+ BOOL introspectionOnly = FALSE,
PEImage * pPEImageIL = NULL,
PEImage * pPEImageNI = NULL,
ICLRPrivAssembly * pHostAssembly = NULL
-#endif
);
#endif
virtual ~PEAssembly();
@@ -1078,17 +1063,12 @@ class PEAssembly : public PEFile
// Indicates if the assembly can be cached in a binding cache such as AssemblySpecBindingCache.
inline bool CanUseWithBindingCache()
{
-#if defined(FEATURE_HOSTED_BINDER)
STATIC_CONTRACT_WRAPPER;
#if !defined(FEATURE_APPX_BINDER)
return (HasBindableIdentity());
#else
return (PEFile::CanUseWithBindingCache() && HasBindableIdentity());
#endif // FEATURE_CORECLR
-#else
- STATIC_CONTRACT_LIMITED_METHOD;
- return true;
-#endif // FEATURE_HOSTED_BINDER
}
};