Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions 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 ddad5a704a
commit d3cbd5920f
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, \
void **aResult) \
{ \
*aResult = nullptr; \
\
NS_ENSURE_PROPER_AGGREGATION(aOuter, aIID); \
*aResult = nullptr; \
if (NS_WARN_IF(aOuter && !aIID.Equals(NS_GET_IID(nsISupports)))) \
return NS_ERROR_INVALID_ARG; \
\
_InstanceClass* inst = new _InstanceClass(aOuter); \
if (!inst) { \
@ -308,9 +308,9 @@ static nsresult \
_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
void **aResult) \
{ \
*aResult = nullptr; \
\
NS_ENSURE_PROPER_AGGREGATION(aOuter, aIID); \
*aResult = nullptr; \
if (NS_WARN_IF(aOuter && !aIID.Equals(NS_GET_IID(nsISupports)))) \
return NS_ERROR_INVALID_ARG; \
\
_InstanceClass* inst = new _InstanceClass(aOuter); \
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) \
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