Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slightly safer and neater fix for strict aliasing bug 351231 r+sr=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@222283 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk
2007-03-23 20:26:20 +00:00
parent 448b263cc7
commit fa43109756
2 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mozilla/xpcom/glue/nsCOMPtr.cpp
View File

@@ -92,64 +92,64 @@ nsCOMPtr_base::assign_with_AddRef( nsISupports* rawPtr )
void
nsCOMPtr_base::assign_from_qi( const nsQueryInterface qi, const nsIID& iid )
{
union { nsISupports *mSupports; void *mVoid; } newRawPtr;
if ( NS_FAILED( qi(iid, &newRawPtr.mVoid) ) )
newRawPtr.mSupports = 0;
assign_assuming_AddRef(newRawPtr.mSupports);
void* newRawPtr;
if ( NS_FAILED( qi(iid, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
}
void
nsCOMPtr_base::assign_from_qi_with_error( const nsQueryInterfaceWithError& qi, const nsIID& iid )
{
union { nsISupports* mSupports; void *mVoid; } newRawPtr;
if ( NS_FAILED( qi(iid, &newRawPtr.mVoid) ) )
newRawPtr.mSupports = 0;
assign_assuming_AddRef(newRawPtr.mSupports);
void* newRawPtr;
if ( NS_FAILED( qi(iid, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
}
void
nsCOMPtr_base::assign_from_gs_cid( const nsGetServiceByCID gs, const nsIID& iid )
{
union { nsISupports* mSupports; void *mVoid; } newRawPtr;
if ( NS_FAILED( gs(iid, &newRawPtr.mVoid) ) )
newRawPtr.mSupports = 0;
assign_assuming_AddRef(newRawPtr.mSupports);
void* newRawPtr;
if ( NS_FAILED( gs(iid, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
}
void
nsCOMPtr_base::assign_from_gs_cid_with_error( const nsGetServiceByCIDWithError& gs, const nsIID& iid )
{
union { nsISupports* mSupports; void *mVoid; } newRawPtr;
if ( NS_FAILED( gs(iid, &newRawPtr.mVoid) ) )
newRawPtr.mSupports = 0;
assign_assuming_AddRef(newRawPtr.mSupports);
void* newRawPtr;
if ( NS_FAILED( gs(iid, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
}
void
nsCOMPtr_base::assign_from_gs_contractid( const nsGetServiceByContractID gs, const nsIID& iid )
{
union { nsISupports* mSupports; void *mVoid; } newRawPtr;
if ( NS_FAILED( gs(iid, &newRawPtr.mVoid) ) )
newRawPtr.mSupports = 0;
assign_assuming_AddRef(newRawPtr.mSupports);
void* newRawPtr;
if ( NS_FAILED( gs(iid, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
}
void
nsCOMPtr_base::assign_from_gs_contractid_with_error( const nsGetServiceByContractIDWithError& gs, const nsIID& iid )
{
union { nsISupports* mSupports; void *mVoid; } newRawPtr;
if ( NS_FAILED( gs(iid, &newRawPtr.mVoid) ) )
newRawPtr.mSupports = 0;
assign_assuming_AddRef(newRawPtr.mSupports);
void* newRawPtr;
if ( NS_FAILED( gs(iid, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
}
void
nsCOMPtr_base::assign_from_helper( const nsCOMPtr_helper& helper, const nsIID& iid )
{
union { nsISupports* mSupports; void *mVoid; } newRawPtr;
if ( NS_FAILED( helper(iid, &newRawPtr.mVoid) ) )
newRawPtr.mSupports = 0;
assign_assuming_AddRef(newRawPtr.mSupports);
void* newRawPtr;
if ( NS_FAILED( helper(iid, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
}
void**

56
mozilla/xpcom/glue/nsCOMPtr.h
View File

@@ -1240,70 +1240,70 @@ template <class T>
void
nsCOMPtr<T>::assign_from_qi( const nsQueryInterface qi, const nsIID& aIID )
{
union { T* mT; void *mVoid; } newRawPtr;
if ( NS_FAILED( qi(aIID, &newRawPtr.mVoid) ) )
newRawPtr.mT = 0;
assign_assuming_AddRef(newRawPtr.mT);
void* newRawPtr;
if ( NS_FAILED( qi(aIID, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
}
template <class T>
void
nsCOMPtr<T>::assign_from_qi_with_error( const nsQueryInterfaceWithError& qi, const nsIID& aIID )
{
union { T* mT; void *mVoid; } newRawPtr;
if ( NS_FAILED( qi(aIID, &newRawPtr.mVoid) ) )
newRawPtr.mT = 0;
assign_assuming_AddRef(newRawPtr.mT);
void* newRawPtr;
if ( NS_FAILED( qi(aIID, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
}
template <class T>
void
nsCOMPtr<T>::assign_from_gs_cid( const nsGetServiceByCID gs, const nsIID& aIID )
{
union { T* mT; void *mVoid; } newRawPtr;
if ( NS_FAILED( gs(aIID, &newRawPtr.mVoid) ) )
newRawPtr.mT = 0;
assign_assuming_AddRef(newRawPtr.mT);
void* newRawPtr;
if ( NS_FAILED( gs(aIID, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
}
template <class T>
void
nsCOMPtr<T>::assign_from_gs_cid_with_error( const nsGetServiceByCIDWithError& gs, const nsIID& aIID )
{
union { T* mT; void *mVoid; } newRawPtr;
if ( NS_FAILED( gs(aIID, &newRawPtr.mVoid) ) )
newRawPtr.mT = 0;
assign_assuming_AddRef(newRawPtr.mT);
void* newRawPtr;
if ( NS_FAILED( gs(aIID, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
}
template <class T>
void
nsCOMPtr<T>::assign_from_gs_contractid( const nsGetServiceByContractID gs, const nsIID& aIID )
{
union { T* mT; void *mVoid; } newRawPtr;
if ( NS_FAILED( gs(aIID, &newRawPtr.mVoid) ) )
newRawPtr.mT = 0;
assign_assuming_AddRef(newRawPtr.mT);
void* newRawPtr;
if ( NS_FAILED( gs(aIID, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
}
template <class T>
void
nsCOMPtr<T>::assign_from_gs_contractid_with_error( const nsGetServiceByContractIDWithError& gs, const nsIID& aIID )
{
union { T* mT; void *mVoid; } newRawPtr;
if ( NS_FAILED( gs(aIID, &newRawPtr.mVoid) ) )
newRawPtr.mT = 0;
assign_assuming_AddRef(newRawPtr.mT);
void* newRawPtr;
if ( NS_FAILED( gs(aIID, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
}
template <class T>
void
nsCOMPtr<T>::assign_from_helper( const nsCOMPtr_helper& helper, const nsIID& aIID )
{
union { T* mT; void *mVoid; } newRawPtr;
if ( NS_FAILED( helper(aIID, &newRawPtr.mVoid) ) )
newRawPtr.mT = 0;
assign_assuming_AddRef(newRawPtr.mT);
void* newRawPtr;
if ( NS_FAILED( helper(aIID, &newRawPtr) ) )
newRawPtr = 0;
assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
}
template <class T>