Removed the #ifdef DEBUG around the definition of NS_ENSURE. The only difference between the two was the NS_ERROR. NS_ERROR is already conditional upon debug so this was a bit redundant.

This commit is contained in:
tbogard%aol.net 1999-08-25 03:16:23 +00:00
Родитель 9ecb0eb822
Коммит 80ec2cfdfb
2 изменённых файлов: 0 добавлений и 22 удалений

Просмотреть файл

@ -794,7 +794,6 @@ CallQueryInterface( nsISupports* aSource, DestinationType** aDestination )
////////////////////////////////////////////////////////////////////////////////
// Macros for checking state and arguments upon entering interface boundaries
////////////////////////////////////////////////////////////////////////////////
#if defined(NS_DEBUG)
#define NS_ENSURE(x, ret) \
PR_BEGIN_MACRO \
@ -805,16 +804,6 @@ PR_BEGIN_MACRO \
} \
PR_END_MACRO
#else // !NS_DEBUG
#define NS_ENSURE(x, ret) \
PR_BEGIN_MACRO \
if(!(x)) \
return ret; \
PR_END_MACRO
#endif // !NS_DEBUG
#define NS_ENSURE_NOT(x, ret) \
NS_ENSURE(!(x), ret)

Просмотреть файл

@ -794,7 +794,6 @@ CallQueryInterface( nsISupports* aSource, DestinationType** aDestination )
////////////////////////////////////////////////////////////////////////////////
// Macros for checking state and arguments upon entering interface boundaries
////////////////////////////////////////////////////////////////////////////////
#if defined(NS_DEBUG)
#define NS_ENSURE(x, ret) \
PR_BEGIN_MACRO \
@ -805,16 +804,6 @@ PR_BEGIN_MACRO \
} \
PR_END_MACRO
#else // !NS_DEBUG
#define NS_ENSURE(x, ret) \
PR_BEGIN_MACRO \
if(!(x)) \
return ret; \
PR_END_MACRO
#endif // !NS_DEBUG
#define NS_ENSURE_NOT(x, ret) \
NS_ENSURE(!(x), ret)