Skip to content

C
core
Kaydet (Commit) a78102d3 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

WaE: declaration of 'hr' shadows a previous local

üst 7419e0e0
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
embedserv/source/inprocserv/inprocembobj.cxx
Dosyayı görüntüle @ a78102d3
...@@ -717,8 +717,8 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite ) ...@@ -717,8 +717,8 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
if ( SUCCEEDED( hr ) && pOleObject ) if ( SUCCEEDED( hr ) && pOleObject )
{ {
HRESULT hr = pOleObject->SetClientSite( pSite ); HRESULT hr2 = pOleObject->SetClientSite( pSite );
if ( SUCCEEDED( hr ) ) if ( SUCCEEDED( hr2 ) )
{ {
m_pClientSite = pSite; m_pClientSite = pSite;
...@@ -733,7 +733,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite ) ...@@ -733,7 +733,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
m_pOleContainer->LockContainer( TRUE ); m_pOleContainer->LockContainer( TRUE );
} }
return hr; return hr2;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment