wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 672843 part B - Remove NS_ENSURE_PROPER_AGGREGATION, r=froydnj

Browse Source
This commit is contained in:
Benjamin Smedberg 2013-11-19 16:27:36 -05:00
parent 66f5c04d02
commit 9890b5ef50
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xpcom/base/nsAgg.h
View File

@ -285,9 +285,9 @@ static nsresult \
_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \ _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
void **aResult) \ void **aResult) \
{ \ { \
*aResult = nullptr; \ *aResult = nullptr; \
\ if (NS_WARN_IF(aOuter && !aIID.Equals(NS_GET_IID(nsISupports)))) \
NS_ENSURE_PROPER_AGGREGATION(aOuter, aIID); \ return NS_ERROR_INVALID_ARG; \
\ \
_InstanceClass* inst = new _InstanceClass(aOuter); \ _InstanceClass* inst = new _InstanceClass(aOuter); \
if (!inst) { \ if (!inst) { \
@ -308,9 +308,9 @@ static nsresult \
_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \ _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
void **aResult) \ void **aResult) \
{ \ { \
*aResult = nullptr; \ *aResult = nullptr; \
\ if (NS_WARN_IF(aOuter && !aIID.Equals(NS_GET_IID(nsISupports)))) \
NS_ENSURE_PROPER_AGGREGATION(aOuter, aIID); \ return NS_ERROR_INVALID_ARG; \
\ \
_InstanceClass* inst = new _InstanceClass(aOuter); \ _InstanceClass* inst = new _InstanceClass(aOuter); \
if (!inst) { \ if (!inst) { \

3
xpcom/glue/nsDebug.h
View File

@ -375,9 +375,6 @@ inline bool NS_warn_if_impl(bool condition, const char* expr, const char* file,
#define NS_ENSURE_NO_AGGREGATION(outer) \ #define NS_ENSURE_NO_AGGREGATION(outer) \
NS_ENSURE_FALSE(outer, NS_ERROR_NO_AGGREGATION) NS_ENSURE_FALSE(outer, NS_ERROR_NO_AGGREGATION)
#define NS_ENSURE_PROPER_AGGREGATION(outer, iid) \
NS_ENSURE_FALSE(outer && !iid.Equals(NS_GET_IID(nsISupports)), NS_ERROR_INVALID_ARG)
/*****************************************************************************/ /*****************************************************************************/
#ifdef XPCOM_GLUE #ifdef XPCOM_GLUE