summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/debug/daccess/dacdbiimpl.h3
-rw-r--r--src/inc/metadata.h3
-rw-r--r--src/inc/stgpool.h4
-rw-r--r--src/md/compiler/regmeta.h7
-rw-r--r--src/md/inc/recordpool.h4
5 files changed, 21 insertions, 0 deletions
diff --git a/src/debug/daccess/dacdbiimpl.h b/src/debug/daccess/dacdbiimpl.h
index ab9cab54fa..7da45e63de 100644
--- a/src/debug/daccess/dacdbiimpl.h
+++ b/src/debug/daccess/dacdbiimpl.h
@@ -642,6 +642,9 @@ public:
// CordbAssembly, CordbModule
// ============================================================================
+ using ClrDataAccess::GetModuleData;
+ using ClrDataAccess::GetAddressType;
+
public:
// Get the full path and file name to the assembly's manifest module.
BOOL GetAssemblyPath(VMPTR_Assembly vmAssembly,
diff --git a/src/inc/metadata.h b/src/inc/metadata.h
index d6dc0b78c9..c765ed5844 100644
--- a/src/inc/metadata.h
+++ b/src/inc/metadata.h
@@ -1110,6 +1110,9 @@ EXTERN_GUID(IID_IMDInternalImportENC, 0xe03d7730, 0xd7e3, 0x11d2, 0x8c, 0xd, 0x0
#define INTERFACE IMDInternalImportENC
DECLARE_INTERFACE_(IMDInternalImportENC, IMDInternalImport)
{
+private:
+ using IMDInternalImport::ApplyEditAndContinue;
+public:
// ENC only methods here.
STDMETHOD(ApplyEditAndContinue)( // S_OK or error.
MDInternalRW *pDelta) PURE; // Interface to MD with the ENC delta.
diff --git a/src/inc/stgpool.h b/src/inc/stgpool.h
index 153a5b7e04..5932a51464 100644
--- a/src/inc/stgpool.h
+++ b/src/inc/stgpool.h
@@ -1094,6 +1094,10 @@ private:
class StgBlobPool : public StgPool
{
friend class VerifyLayoutsMD;
+
+ using StgPool::InitNew;
+ using StgPool::InitOnMem;
+
public:
StgBlobPool(ULONG ulGrowInc=DFT_BLOB_HEAP_SIZE) :
StgPool(ulGrowInc),
diff --git a/src/md/compiler/regmeta.h b/src/md/compiler/regmeta.h
index d2ca0fa0ca..10642e46bb 100644
--- a/src/md/compiler/regmeta.h
+++ b/src/md/compiler/regmeta.h
@@ -109,6 +109,13 @@ struct CCustAttrHashKey
class CCustAttrHash : public CClosedHashEx<CCustAttrHashKey, CCustAttrHash>
{
typedef CCustAttrHashKey T;
+
+ using CClosedHashEx<CCustAttrHashKey, CCustAttrHash>::Hash;
+ using CClosedHashEx<CCustAttrHashKey, CCustAttrHash>::Compare;
+ using CClosedHashEx<CCustAttrHashKey, CCustAttrHash>::Status;
+ using CClosedHashEx<CCustAttrHashKey, CCustAttrHash>::SetStatus;
+ using CClosedHashEx<CCustAttrHashKey, CCustAttrHash>::GetKey;
+
public:
CCustAttrHash(int iBuckets=37) : CClosedHashEx<CCustAttrHashKey,CCustAttrHash>(iBuckets) {}
unsigned int Hash(const T *pData);
diff --git a/src/md/inc/recordpool.h b/src/md/inc/recordpool.h
index 65d8700ec5..15c5532bc0 100644
--- a/src/md/inc/recordpool.h
+++ b/src/md/inc/recordpool.h
@@ -25,6 +25,10 @@
class RecordPool : public StgPool
{
friend class VerifyLayoutsMD;
+
+ using StgPool::InitNew;
+ using StgPool::InitOnMem;
+
public:
RecordPool() :
StgPool(1024, 1)