ContainerObject -> ContainingObject

diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp
index 8128fe7d77f8ea0b3b4fe0496a1cac00070c4da7..04f63f830a5ee2c67b0fdb6ecde7af9f714cb561 100644 (file)
--- a/src/debug/di/process.cpp
+++ b/src/debug/di/process.cpp
@@ -2529,7 +2529,7 @@ COM_METHOD CordbProcess::EnableExceptionCallbacksOutsideOfMyCode(BOOL enableExce
     return hr;
 }
 
-COM_METHOD CordbProcess::GetContainerObject(CORDB_ADDRESS interiorPointer, ICorDebugObjectValue** ppContainerObject)
+COM_METHOD CordbProcess::GetContainingObject(CORDB_ADDRESS interiorPointer, ICorDebugObjectValue** ppContainingObject)
 {
     HRESULT hr = S_OK;
     // TODO, databp, I don't know what I am doing, NO_LOCK doesn't sound right
@@ -2552,7 +2552,7 @@ COM_METHOD CordbProcess::GetContainerObject(CORDB_ADDRESS interiorPointer, ICorD
     {
         _ASSERTE(event.type == DB_IPCE_GET_CONTAINER_RESULT);
         CORDB_ADDRESS containerAddress = PTR_TO_CORDB_ADDRESS(event.GetContainerResult.answer);
-        hr = this->GetObject(containerAddress, ppContainerObject);
+        hr = this->GetObject(containerAddress, ppContainingObject);
     }
 
     PUBLIC_API_END(hr);

diff --git a/src/debug/di/rspriv.h b/src/debug/di/rspriv.h
index 1e01c5cde4716aeed712abccc89b1f8c227ccad2..868d6f6d01ab5fa55917954a5ae7474ab6294514 100644 (file)
--- a/src/debug/di/rspriv.h
+++ b/src/debug/di/rspriv.h
@@ -3165,7 +3165,7 @@ public:
     //-----------------------------------------------------------
     // ICorDebugProcess9
     //-----------------------------------------------------------
-    COM_METHOD GetContainerObject(CORDB_ADDRESS interiorPointer, ICorDebugObjectValue** ppContainerObject);
+    COM_METHOD GetContainingObject(CORDB_ADDRESS interiorPointer, ICorDebugObjectValue** ppContainingObject);
 
 #ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL
     // ---------------------------------------------------------------

diff --git a/src/inc/cordebug.idl b/src/inc/cordebug.idl
index dfba621ce5f7aa53d5867f57300e6108959de95e..e016ad2773c59abf068b51e18965277b207b0931 100644 (file)
--- a/src/inc/cordebug.idl
+++ b/src/inc/cordebug.idl
@@ -3268,7 +3268,7 @@ interface ICorDebugProcess8 : IUnknown
 ]
 interface ICorDebugProcess9 : IUnknown
 {
-    HRESULT GetContainerObject([in] CORDB_ADDRESS interiorPointer, [out] ICorDebugObjectValue** ppContainerObject);
+    HRESULT GetContainingObject([in] CORDB_ADDRESS interiorPointer, [out] ICorDebugObjectValue** ppContainingObject);
 }
 
 // Event types MODULE_LOADED and MODULE_UNLOADED implement this interface

diff --git a/src/pal/prebuilt/inc/cordebug.h b/src/pal/prebuilt/inc/cordebug.h
index 1b9fd21063efb3c020e58f5828428d773af56c01..b3d1612bf86c56ad17c98be5aea38e77fa44d2e2 100644 (file)
--- a/src/pal/prebuilt/inc/cordebug.h
+++ b/src/pal/prebuilt/inc/cordebug.h
@@ -7840,9 +7840,9 @@ EXTERN_C const IID IID_ICorDebugProcess9;
     ICorDebugProcess9 : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetContainerObject( 
+        virtual HRESULT STDMETHODCALLTYPE GetContainingObject( 
             /* [in] */ CORDB_ADDRESS interiorPointer,
-            /* [out] */ ICorDebugObjectValue **ppContainerObject) = 0;
+            /* [out] */ ICorDebugObjectValue **ppContainingObject) = 0;
         
     };
     
@@ -7865,10 +7865,10 @@ EXTERN_C const IID IID_ICorDebugProcess9;
         ULONG ( STDMETHODCALLTYPE *Release )( 
             ICorDebugProcess9 * This);
         
-        HRESULT ( STDMETHODCALLTYPE *GetContainerObject )( 
+        HRESULT ( STDMETHODCALLTYPE *GetContainingObject )( 
             ICorDebugProcess9 * This,
             /* [in] */ CORDB_ADDRESS interiorPointer,
-            /* [out] */ ICorDebugObjectValue **ppContainerObject);
+            /* [out] */ ICorDebugObjectValue **ppContainingObject);
         
         END_INTERFACE
     } ICorDebugProcess9Vtbl;
@@ -7893,8 +7893,8 @@ EXTERN_C const IID IID_ICorDebugProcess9;
     ( (This)->lpVtbl -> Release(This) ) 
 
 
-#define ICorDebugProcess9_GetContainerObject(This,interiorPointer,ppContainerObject)   \
-    ( (This)->lpVtbl -> GetContainerObject(This,interiorPointer,ppContainerObject) ) 
+#define ICorDebugProcess9_GetContainingObject(This,interiorPointer,ppContainingObject) \
+    ( (This)->lpVtbl -> GetContainingObject(This,interiorPointer,ppContainingObject) ) 
 
 #endif /* COBJMACROS */