WaE: declaration of 'hr' shadows a previous local

This commit is contained in:
David Tardon 2012-03-07 18:24:05 +01:00
parent 7419e0e00c
commit a78102d342

View File

@ -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 )
m_pOleContainer->LockContainer( TRUE ); m_pOleContainer->LockContainer( TRUE );
} }
return hr; return hr2;
} }
} }