mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 351231: type-pun warnings from nsCOMPtr. r+sr=dbaron.

This commit is contained in:
kjh-5727%comcast.net 2006-11-23 13:21:27 +00:00
Родитель d7d592d2f1
Коммит 274fddbe21
2 изменённых файлов: 70 добавлений и 70 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

84
xpcom/glue/nsCOMPtr.cpp
Просмотреть файл

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

56
xpcom/glue/nsCOMPtr.h
Просмотреть файл

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